MAPREDUCE-2012. Some contrib tests fail in branch 0.21 and trunk. Contributed by Amareshwari Sriramadasu.