Cleanup keystoneclient testing requirements

Change-Id: I9f3a3be700c3d27c600092ce339428a34d73c22e
Merge "Cleanup keystoneclient testing requirements"