Fix unit tests
Fix ServiceJsonEncoder/Decoder

Make Encoder/Decoder work with json.dump/load as well as direct calls
to encode/decode
Merge pull request #156 from zenoss/feature/controlPlaneClientCleanup

ControlPlaneClient cleanup