add group, team, et all to drop down lists for service roles
Merge branch 'maint-rel-1.6' into develop