Conflicts:
	hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
	hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
	hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java

Change-Id: I3dd100582af78089c25b73deef3a53ff963ef73e

HDDS-10560. Link rocksdb lib to Ozone rocksdb tools lib relative path instead of absolute path (#6414)

Co-authored-by: ashishk <ashishk@cloudera.com>

This reverts commit ccaaf571.

Reason for revert: intermittent test failures (HDDS-10654)

HDDS-10590. [Snapshot] Synchronized snapshot purge, set snapshot property and SstFilteringService (#6456)

(cherry picked from commit 2651d4c2)

Conflicts:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java

HDDS-10626. [LeaseRecovery] OM shuts down with 'SecretKey client must have been initialized already' (#6467)

HDDS-10636. Ozone Recon - Filter EMPTY MISSING Containers in UnHealthy State Containers API. (#6471)

Co-authored-by: deveshsingh <devmadhu@devesh_76@hotmail.com>

(cherry picked from commit 82c02d3e)