Merge "Fix api_version filter for KeystoneV3AuthProvider"