Merge advanced.config change instead of overwrite

A recent change to the automated build environment broke our testing; see https://github.com/basho/riak-erlang-client/commit/49db14dca06846172563e853dedb75636d878e26 for the temporary fix.

Do moar better.