Merge pull request #1387 from skazancev/skazancev/using-apiary-key-from-yml

fix: using "apiaryApiKey" and "apiaryApiName" from dredd.yml config

Author: honzajavorek

lib/CLI.js

@@ -331,7 +331,11 @@ ${packageData.name} v${packageData.version} \
     if (!cliConfig.path) { cliConfig.path = []; }
     cliConfig.path.push(this.argv._[0]);
 
-    cliConfig.custom = this.custom;
+    // Merge "this.custom" which is an input of CLI constructor
+    // (used for internal testing), and "cliConfig" which is a result
+    // of merge upon "argv". Otherwise "custom" key from "dredd.yml"
+    // is always overridden by "this.custom".
+    cliConfig.custom = R.mergeDeepRight(this.custom, cliConfig.custom || {});
 
     return cliConfig;
   }