cleanup
cleanup
removed java fixups; moved to puppet-java
replaced some shell commands with puppety things
fixes for tests