Merge "Remove last references to python-keystoneclient"