am 03539a36: Merge "Ensure that the port number and TXID are properly randomized." into jb-dev

* commit '03539a36b634bdfa61c06277cf25e0ca8e3105ba':
  Ensure that the port number and TXID are properly randomized.