[openFATE 306116] Better lock handling in zypper