Merge pull request #1595 from directhex/randomize-tcp-ports-in-tests