Merge changes I62ea60f8,If6613ec1

* changes:
  Improvements to sock_diag code.
  Enable various lock debugging options.