server: benchmark: Merge branch 'jvf_refactor' of...

server: benchmark: Merge branch 'jvf_refactor' of https://code.google.com/r/jensvfischer-personal into refactor

Conflicts:
	java/servers/src/org/xtreemfs/sandbox/benchmark/CLIOptions.java