CW-438 Applied official patch from Drupal community
Merge branch 'HOTFIX-438-node-url-translation'