update tests to more recent puppet version
add different config location for Debian and RedHat
change default metrics query from 15 to 60 seconds
add alias, username and password to jvm metrics
add metrics definition for tomcat6