Merge "Fix opencotrail keystone endpoint resource v3" into release/2018.4.0