SWF-2547 : add plfdemo entry in adt
SWF-2547 : fix server.xml patch for mysql
Merge branch 'develop'

Conflicts:
	adt.sh
Merge branch 'develop'
Merge branch 'develop'