Fix problems related to 'use custom lock command' that metrics found.
Fix problems related to 'use custom lock command' that metrics found.


git-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@28784 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

jordemort/e17,jordemort/e17,jordemort/e17