[Bug 458887] Improved locks handling during upgrade