Don't need javaclasspath on Workers anymore
Merge branch 'orig'