mail: merge back group aliases when user aliases are changed
Merge branch 'mds-2.6'