GIRAPH-819: Number of Containers required for a job (Rafal Wojdyla via ereisman)
Revert "Revert "Merge branch 'trunk' into GIRAPH-OOC""

This reverts commit cbba92de8d5e66af264e0ab5c62989e15d78f32a.
GIRAPH-834
Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' into GIRAPH-OOC
fix partition store usage for DiskPartition support