CDH-12820 Update whirr-cm to cleanly (no warnings) bring up all services after CM 4.6

...igger warnings in CM