Merge "Fix opencotrail keystone endpoint resource v3"