Fix UserGroup name not display in card view or edit
Merge remote-tracking branch 'origin/3.4' into 3.4

Conflicts:
	ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
Merge pull request #1186 from FHenry/3.4

Fix UserGroup name not display in card view or edit