Fixes to cloudinit sample and common-sample.yaml