Merge "Remove python-keystoneclient from test-requirements"