[review] keep mcast group lock for entire action

Includes:
* kyle's patch on scopedguard/group changes (after modifications) with slight mod on del

Author: zeeshanlakhani