There are quite a few issues to resolve here but the vast majority are
down to signature differences.

Change-Id: Ifdcfb4c772e7485ed36c6cce69852a23f31679c2
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>