Merge pull request #1010 from jonboulle/1010_separate_ports

separate ports used for client/server communication
main: switch back to default ports