Merge "ServerCfnInitTestJSON wait for stack complete before ssh"