Merge with trunk r728420.

git-svn-id: https://svn.apache.org/repos/asf/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH@728430 13f79535-47bb-0310-9956-ffa450edef68
157 files changed