units: consolidate systemd units

Take advantage of the fact that cloudinit can handle multiple sources
now. Add a more permanent solution to our ordering issue
(oem-cloudinit.service).