alow clean up Railo and CFWHeels
Merge remote-tracking branch 'origin/step2' into step3
adapt datasource name to follow defaults
Merge remote-tracking branch 'origin/step2' into step3
adapt datasource name to follow defaults