Decouple into 2 kubernetes heat resource groups
Remove EtcdAdminMachine & WaitForMachines()