Item12823: merge from release branch

git-svn-id: http://svn.foswiki.org/trunk@17451 0b4bb1d4-4e5a-0410-9cc4-b2b747904278