Merge change I96e99082 into eclair

* changes:
  [Issue 2171774] Fixing the fixStructuredNameComponents() method