Merge "Update "create_server" to wait until status is 'ACTIVE'"