Added way to get master host address from opts
Merge remote-tracking branch 'upstream/develop' into sam_raet_12
Merge pull request #10751 from SmithSamuelM/sam_raet_12

Sam raet 12