MBS-5993: Fix the usage of the 'name-variation' class

Now this class is only applied if the caller actually specifies non-blank alternative text.
Merge branch 'mbs-5993' into beta

* mbs-5993:
  MBS-5993: Fix the usage of the 'name-variation' class