CDH-12517 Resolve whirr-cm issues with CM 4.6