modified:   server/src/com/vaadin/server/VaadinService.java
Merge branch '7.0.5.x'