Update parent to avoid false negatives for test results
Backport additional ctors and methods for locators
[BZ #1172419] Read port number as unsigned, always