[IMP] Support for multiple master users asocied to subdomain database management. e.g. cbc:<user>@<password>
Merge remote-tracking branch 'origin/7.0' into 7.0