Fixed merge issues RAVE-880

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