Fix: cloud-init in openstack uses top-level userdata

Change-Id: I79821b729326999c728e0803536d18c0738c35d6
Merge "Fix: cloud-init in openstack uses top-level userdata"