More java dependency updates including ehcache, shiro-web.  Also clean up UPGRADING

git-svn-id: https://svn.apache.org/repos/asf/shindig/trunk@1620871 13f79535-47bb-0310-9956-ffa450edef68