Port CMBeta1 CSD Spark support to CMBeta2 implementation
Recognise Spark is bundled as part of CDH5 and not CDH4
Resolve Spark port config naming issue
Merge pull request #51 from ggear/graham-patch-CDH-15652

CDH-15652: Whirr-CM to support Spark