Merge "Make wait_until default as 'ACTIVE' in manager.create_server"