CDK-656: Updates to the examples based on testing with the CDH 5.1 QS VM

+1 once this is fixed.