cleanups for java/jruby/log4j environment checks
Merge branch 'environment_cleanup'