forward port changes from TILES_3_0_X branch
 `svn merge -r1594481:1626663 ^/tiles/framework/branches/TILES_3_0_X .`


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