Merge branch 'master' into ckleineweber-tracing

Conflicts:
	cpp/generated/pbrpc/PingServiceClient.h
	cpp/generated/pbrpc/PingServiceConstants.h
	cpp/generated/xtreemfs/DIRServiceClient.h
	cpp/generated/xtreemfs/DIRServiceConstants.h
	cpp/generated/xtreemfs/GlobalTypes.pb.cc
	cpp/generated/xtreemfs/GlobalTypes.pb.h
	cpp/generated/xtreemfs/MRCServiceClient.h
	cpp/generated/xtreemfs/MRCServiceConstants.h
	cpp/generated/xtreemfs/OSDServiceClient.h
	cpp/generated/xtreemfs/OSDServiceConstants.h
	cpp/generated/xtreemfs/get_request_message.cc
	cpp/generated/xtreemfs/get_request_message.h
	cpp/src/xtfsutil/xtfsutil.cpp
	interface/xtreemfs/GlobalTypes.proto
	java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java
	java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java
	java/servers/src/org/xtreemfs/common/Capability.java
	java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
	java/servers/src/org/xtreemfs/mrc/operations/OpenOperation.java
	java/servers/src/org/xtreemfs/mrc/operations/TruncateOperation.java
	java/servers/src/org/xtreemfs/mrc/utils/MRCHelper.java
	java/servers/src/org/xtreemfs/osd/OSDRequestDispatcher.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.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/OSDServiceClient.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java