Applying the rest of Erin's patch for RAVE-891

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