abord build if mergeConfig returns an error and fix duplicate error message
Add test
add missing error check
Minor updates to postgresql_service.rst

I've added the steps that were missing/wrong for me when I went through this just now.
tell the new developer how they can replace the real docker binary with the one they've been hacking on (#2142)
Merge pull request #2142 from SvenDowideit/patch-1

tell the new developer how they can replace the real docker binary with ...
Merge pull request #2160 from iffy/patch-1

Minor updates to postgresql_service.rst
Prevent docker-ci to test closing PRs
Merge pull request #2211 from mzdaniel/2190-docker-ci

Prevent docker-ci to test closing PRs
Remove @KSid from contrib maintainers for now

His availability has been very limited, so I'll take over completely for the short term until he can find more time to help out.
Merge pull request #2218 from tianon/ksid

Remove @KSid from contrib maintainers for now
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