incorporated MAven changes also to the template version
incorporated MAven changes also to the template version

hansjoachim/fitnesse,rbevers/fitnesse,jdufner/fitnesse,jdufner/fitnesse,rbevers/fitnesse,amolenaar/fitnesse,jdufner/fitnesse,amolenaar/fitnesse,amolenaar/fitnesse,rbevers/fitnesse,hansjoachim/fitnesse,hansjoachim/fitnesse