Merge pull request #54 from ggear/graham-patch-CDH-18341

CDH-18341: Whirr-CM updated for CM-5.0.0 GA