Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Bump JGit version to 3.7.1.201504261725-r
  Hybrid OpenID/OAuth: Check for session validity during logout
  RestApiServlet: Leave OutputStream open when flushing base64 padding
  RestApiServlet: Flush pending padding as well

Change-Id: Ic26b95ca86f6429969d2608be77ce31af10761d2