Split the command server listener dispose into shutdown/dispose

Internally it should have only ever shutdown the connection, but never
disposed of the properties