Rebased from: Change-Id: Ifc9fff4f88dfaebe97b7caba4d603d23c645e346 Reviewed-by: Steven Dake <sdake@redhat.com>
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>