Renamed server.close() to server.stop() to be consistent.

+ Principle of least surprise.  If we standup a server by calling a method named "start", we would prolly expect that to take it down, we would call "stop".
Merge branch 'master' into integration

* master:
  Renamed server.close() to server.stop() to be consistent.