Use MR1-flavored CDH builds too for 2.2, 2.3