Merge branch 'master' into ckleineweber-QoS

Conflicts:
	cpp/generated/xtreemfs/DIRServiceClient.h
	cpp/generated/xtreemfs/MRCServiceClient.h
	cpp/generated/xtreemfs/OSD.pb.cc
	cpp/generated/xtreemfs/OSD.pb.h
	cpp/generated/xtreemfs/OSDServiceClient.h
	cpp/generated/xtreemfs/OSDServiceConstants.h
	cpp/generated/xtreemfs/get_request_message.cc
	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/config/ServiceConfig.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/OSDServiceClient.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java