Adding remaining changes for RAVE-915

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