fixup! Switch to cdh5.2.1 (work in progress)