Merge remote-tracking branch 'main/master' into versioned_xloc_merge

Conflicts:
	cpp/generated/pbrpc/RPC.pb.cc
	cpp/generated/xtreemfs/MRC.pb.cc
	cpp/generated/xtreemfs/OSD.pb.cc
	doc/xtreemfs-userguide/xtfs-guide.pdf
	interface/xtreemfs/OSD.proto
	java/flease/test/org/xtreemfs/foundation/flease/proposer/FleaseProposerTest.java
	java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java
	java/servers/src/org/xtreemfs/mrc/MRCRequestDispatcher.java
	java/servers/src/org/xtreemfs/osd/OSDRequestDispatcher.java
	java/servers/src/org/xtreemfs/osd/operations/DeleteOperation.java
	java/servers/src/org/xtreemfs/osd/operations/EventCloseFile.java
	java/servers/src/org/xtreemfs/osd/stages/PreprocStage.java
	java/servers/src/org/xtreemfs/osd/storage/StorageLayout.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java