[MERGE] Update lock debugging support patch.

[John Arbash Meinel]

John Arbash Meinel has voted tweak.
Status is now: Conditionally approved
Comment:
+    def _track_locks(self):
+        """Track lock activity during tests."""
+        self._lock_actions = []
+        self._lock_check_thorough = 'lock' in debug.debug_flags

^- It is important that this function is called before 
'._clear_debug_flags()' so probably a comment to that effect would be 
good.

I don't have a huge issue with '-Dlock' though in general it doesn't 
seem like '-D...' should be causing failures/errors.

I think it is still an improvement, though.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1241072466.9565.45.camel%40lifeless-64%3E
Project: Bazaar