Config merge

@michaelcahill, here's the code to do config merges separately from config collapse.

Reference #1172.