Now re-reading mysql server port when re-parenting
Fixing error message.
Merge branch 'replication'