RAVE-834 Merge all from trunk at 1403092

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