Add mappedKeyName.x support for relationship.
Merge branch 'hotfix/relationship-multiple-map'