abord build if mergeConfig returns an error and fix duplicate error message
Add test
add missing error check
Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix

Abort build if mergeConfig returns an error and fix duplicate error message