Why is the port needed? That doesn't seem related to the code changes from the branch, I'd be wary of changing this without knowing the full implications.

Going to merge to get to see the results of the test run from jenkins