Merge pull request #411 from apache/geertjanw-patch-16

Tweaking demos.xml file to comment out unused entries