Use a separate lock object in BlockingCell

Patch by GSerjo.
merge bug26510 into default