Google AppEngine changes required absolutely no Java 6 code in the uploaded package. Luckily, we only had a few unused server side libraries that I was able to remove. I updated  the app engine jars as well, and cleaned up the config.
Merge branch 'appengine_java6_fix' into issue330_d3layout