Make troveclient optional

Fixes bug 1221906

Change-Id: I3d022fca2f6bc1f0f5143373259882f2522f7958
Merge "Make troveclient optional"