forward-port r1486577
  svn merge -c1486577 ^/tiles/framework/branches/TILES_3_0_X .


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