Merge branch 'ARIES-1006' into trunk

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