Cherry picking r9594, r9630 into releases/2.2, fix gwt-servlet dep in samples/expenses/pom.xml


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.2@9632 8db76d5a-ed1c-0410-87a9-c151d255dfc7