Fix race condition between cleanup and Start

There was problem when Start might be before cleanup
ping @crosbymichael 
Fixes port allocation problem on fast restarting