Merge changes until RC2 from trunk to release branch using 527171:528912


git-svn-id: https://svn.apache.org/repos/asf/forrest/branches/forrest_08_branch@529802 13f79535-47bb-0310-9956-ffa450edef68
21 files changed