fix some permissions and layout issues
fix some permissions and layout issues

- move Catalina/ into conf/ directory
- do not create any subdirs under Catalina
- fix permissions on server.xml to be 644
- set group sticky bit on conf/ directory

arusso/puppet-tomcat6