Merge branch 'stable-3.0' * stable-3.0: SingleUserGroupTest: Remove unnecessary groupBackend member Change-Id: Icf93f9708d0307c472b84daa3d5edbfaeb4545a2