Extract method fix_disk_layout

Extract the work arounds for HP cloud guest disk layout to a
seperate function.

Change-Id: Ib4a351c229407425c38655f20471baa28969e424