Merge pull request #36 from ggear/graham-patch-CDH-13258

CDH-13258: Provide greater coverage on Whirr-CM integration tests
Update config to include more reasonable defaults