refine merge process. change test port from 4000 to 4123 to avoid port confliction with nomachine daemon.
Merge pull request #142 from whjiang/merge-process

refine merge process. change test port from 4000 to 4123 to avoid port c...