Upgrade to CDH4.2.0, minor fixes in testcases to properly clean up data.