Set master_password for modify command
Merge branch 'rds' into rds_promote_read_replica