Revert "Revert "Revert "explicity clear lock list"""
Revert "Revert "Revert "explicity clear lock list"""

This reverts commit 3edd7efdae96d332d701c531c77d8477e4cbd060.

shisoft/Nebuchadnezzar,shisoft/Nebuchadnezzar