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

Change-Id: I00cadba375631ce74e9e93d304cc7580359b3c62
Merge "Fix: cloud-init in openstack uses top-level userdata" into rc