Fixed sorting and initial selection of cnf templates
Fix reference to old pluginpath
Fixed JUnit reference from cnf templates