Fixing port choice behavior

* restarts should choose a new port
* stop/start should keep the same port