Fixed a unit test failure in EMR.
Merge https://github.com/boto/boto