#276941: D5 port - Remove mail / no mail options from group types. Update patch port omitted for the moment.