Add to clientmanager tests

Change-Id: Iea59c494f31de9c3e1d662f89e6e2babcc8fbd61
Sync oslo-incubator for py33 fixes

Change-Id: I261ec6bb34b29169ba3547305deab051f85a3d4d
Merge "Add to clientmanager tests"
Merge "Sync oslo-incubator for py33 fixes"