Merging in rev 1523445 from Roller trunk (used a set of patch files, applied each separately)

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/roller_5.0@1531586 13f79535-47bb-0310-9956-ffa450edef68