The master_wait_handle and cloud_init_wait_handle are the same,
the node_agent_wait_handle and node_cloud_init_wait_handle are
the same. We just need only one. To converge more with k8s
templates, we should use master_wait_handle instead of
cloud_init_wait_handle and use node_agent_wait_handle instead of
node_cloud_init_wait_handle.
Change-Id: Icc07ef8407c05ef37a35c7f418c11c562572cab5
Closes-Bug: #1603999