Item12735: merge changes from trunk tables

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