Fix regression in slave host address after nginx integration
Fix regression trying to join slave after external AD changes
Fixed wrong calls to isSystem() in master-slave after API changes
fixed get of real ip
Merge branch 'master' into jacalvo/fix-masterslave
Merge pull request #597 from Zentyal/jacalvo/fix-masterslave

Jacalvo/fix masterslave