Merge "Revert "Functional spec for cloud-init support""