Changed to match updates in Common.
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	src/maidsafe/drive/tools/filesystem_benchmark.cc
	src/maidsafe/drive/tools/filesystem_test.cc