Move port insertion from the gateway to the config setup.

Author: mdobson

cli/lib/gateway.js

@@ -38,17 +38,15 @@ Gateway.prototype.start =  (options) => {
   edgeconfig.get({
     systemConfigPath: options.systemConfigPath, 
     apidEndpoint: options.apidEndpoint,
-    configFile: options.configFile
+    configFile: options.configFile,
+    port: options.port
   },  (err, config) => {
     if (err) {
       if(err.name == 'YAMLException') {
         err.message = err.name + ' ' + err.reason + '\n Please run the config command with the same arguments to see a unified config file to see the issue.';
       }
       return console.log('Error downloading configuration. Gateway not started. Reason: ', err.message);
     } else {
-      if (options.port) {
-        config.system.port = parseInt(options.port);
-      }
 
       //inject the apidEndpoint to analytics plugin config
       if(options.apidEndpoint && config['analytics-apid']) {