ba9d4ca956
Most of these were either unnecessary or trivial to resolve. Change-Id: I2952e4906a511f6ffc6c53dc1c582464000e22de Signed-off-by: Stephen Finucane <sfinucan@redhat.com>