am 0e90714a: am a034362b: Merge "Make server port option work on windows"

* commit '0e90714ae7fda2b84caa37ce46982d28c0801943':
  Make server port option work on windows