rpc client test remove rpcapi logic

Remove the test logic which allows overriding the rpcapi, since this
is not used anywhere.  Instead make the rpcapi a test class attribute
so it can be more easily used inside tests.

Change-Id: I21902f46919674093945c84fffda5a8e276f76b5
Merge "rpc client test remove rpcapi logic"