Merge pull request #282 from brosander/PDI-11308-post-merge

PDI-11308 - Allowing specification of username/password in slave server ...