Pull Hadoop 2.3.1 release changes into the roxy code branch.
Merge pull request #169 from Paul-Webster/pull-req-release-roxy-master-781f4a1637fdd238cb7e0ac8ea552180389e7f54

Pull Hadoop 2.3.1 release changes into the roxy code branch. [1/1]