(LOCAL) fix README.md
Merge branch 'trunk' into MAPREDUCE-4282