MFC: 260796

Fix various places where we don't properly release a lock.

PR:		185043
Submitted by:	Michael Bentkofsky