Backport upstream fixes for lock issue and unexpected metadata deletion

What's Changed

• reverting commits 2c59857 and f362aed by @shenodaguirguis in #88
• Backport apache/iceberg#2328 and its prerequisites by @autumnust in #89

Full Changelog: 0.11.0.19...0.11.0.22

Release-r's Note:

This release contains a few patches to fix bugs that we saw.
Details are contained in #89