Fix the issues this uncovers. We also migrate to the native hacking pre-commit hook. Change-Id: I44385c25fcb010f3e62b4098fd34ae3290292630 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>