Merge branch 'master' into ckleineweber-tracing

Conflicts:
	cpp/generated/xtreemfs/GlobalTypes.pb.cc
	cpp/src/xtfsutil/xtfsutil.cpp
	java/servers/src/org/xtreemfs/mrc/database/VolumeInfo.java
	java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
	java/servers/src/org/xtreemfs/mrc/utils/MRCHelper.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java
	java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java