Consolidate two Client interfaces

This now lives in the api package since it is used by the Rep

[#73929792]

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>