Branching for 2.5.0-update1

git-svn-id: https://svn.apache.org/repos/asf/shindig/branches/2.5.0-update1@1513693 13f79535-47bb-0310-9956-ffa450edef68