Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/remove-group-role-api-2986

lp://qastaging/~divmod-dev/divmod.org/remove-group-role-api-2986 has no merge proposals.