Probably more stuff will need reneedling when this hits the compose tests... Signed-off-by: Adam Williamson <awilliam@redhat.com>