abord build if mergeConfig returns an error and fix duplicate error message
Add test
add missing error check
Fixed broken tests

Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Merge pull request #2230 from shykes/hack-select-test

hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Remove error messages which are not actually errors
Merge pull request #2232 from shykes/error-should-be-debug

Remove error messages which are not actually errors
Merge pull request #2221 from flavio/fix_broken_tests

Fixed broken tests
Update Dockerfile test comment
Merge pull request #2235 from dotcloud/update_dockerfile

Update Dockerfile test comment
Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix

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