SWITCHYARD-1344 Add a demo for clustering
Merge remote-tracking branch 'upstream/master'