Merge remote-tracking branch 'main/master' into jdillmann-osd-sel-pol

Conflicts:
	cpp/generated/xtreemfs/MRC.pb.cc
	cpp/generated/xtreemfs/MRC.pb.h
	cpp/generated/xtreemfs/MRCServiceClient.h
	cpp/generated/xtreemfs/MRCServiceConstants.h
	cpp/generated/xtreemfs/OSD.pb.cc
	cpp/generated/xtreemfs/OSDServiceClient.h
	cpp/generated/xtreemfs/OSDServiceConstants.h
	cpp/generated/xtreemfs/get_request_message.cc
	cpp/generated/xtreemfs/get_request_message.h
	interface/xtreemfs/MRC.proto
	java/servers/src/org/xtreemfs/common/Capability.java
	java/servers/src/org/xtreemfs/mrc/stages/ProcessingStage.java
	java/servers/src/org/xtreemfs/mrc/stages/XLocSetCoordinator.java
	java/servers/src/org/xtreemfs/osd/OSDRequestDispatcher.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