[review] make sure lock is for the full action

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

Author: zeeshanlakhani