Merge pull request #47 from ggear/graham-patch-CDH-15508

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