Upgrade to CDH 4.2.1