porting 2.9.1-incubating-1 from trunk

git-svn-id: https://svn.apache.org/repos/asf/incubator/jspwiki/branches/MVN3_BRANCH@1470729 13f79535-47bb-0310-9956-ffa450edef68