Change home dir to tomcat user
Merge branch 'temp' into puppet3