fix multi-master client_conf bug; add more unittest stubs.
Authored by: bdl62 2011-07-23
Parent: [r694]
Child: [r696]