CDK-647: Updates to demo for working on the CDH 5.1 QuickStart VM