Add the :env strategy, fix some env related bugs
Fix JRuby test failures