Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."