Updated from global requirements

Change-Id: Ie2f60bde29efb29dd28742ebf37f611847e2bd7b
Tidy up rpc_client definitions

Each api and test cases use different client names.  This patch
changes everything to use self.rpc_client

blueprint: oslo-messaging

Change-Id: If94fd72a36cce1863296d0f64c75815abfd22a8c
Merge "Updated from global requirements"