reverse merge to before release start

git-svn-id: https://svn.apache.org/repos/asf/rave/branches/0.21.1@1478547 13f79535-47bb-0310-9956-ffa450edef68