updated java
fixed version bug in jetty config
fixed bug in generator script
fixed java base-image generation for ubuntu with openjdk 7