Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: SingleUserGroupTest: Remove unnecessary groupBackend member Change-Id: I6e091ea1d7381ddc176948aa3def7de4adc879db