Locking on a group. NOT as a whole
Merge pull request #478 from rackerlabs/lock_fix

Locking on a group. NOT as a whole