fix mergeConfig with new ports
Merge pull request #2593 from dotcloud/2578

Fix mergeConfig with new ports