Merge "Update v3 oauth consumers tests to work w/ pre-prov"