forward port r1571643
 with `svn merge -c1571643 ^/tiles/framework/branches/TILES_3_0_X .`

ref: http://thread.gmane.org/gmane.comp.apache.tiles.scm/576


git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1571644 13f79535-47bb-0310-9956-ffa450edef68