Merge "Bug 372 - Cloud init files do not get applied on Openstack/AWS datacenters"