Merge "Some keystone V3 API tests throw incorrect errors"