Select unique port increments for TestUtils.getNextAvailablePort
Use internal code rather than reimplementing. Fix CmdArgs argument processing.