Change override behavior to merge override.cfg into client.cfg

@mulby Here's the tool we talked about that merges .cfg files.
I tested that it works fine in our env.

The problem is, my task machines are still not reading the overrides...