run after cloud-init if it's installed
Merge pull request #10622 from gfa/develop

run after cloud-init if it's installed