MBS-6769: In auto-completer, only show sort names if they differ from main names
Merge branch 'mbs-6769' into beta

Conflicts:
	root/static/scripts/common/MB/Control/Autocomplete.js