Extract proxy/config common functions for reuse

Refactor proxy to use the common config.  This is a prereq for #356 and the commits 
have had feedback from @thockin only.
Also fix tests.
Updates are outside the scope of the lock, just because we don't need to hold the read lock and those operations could be long running.