CDH-15508: Update Whirr-CM to support CM5 / CDH5