Merge branch 'JAVA8' into trunk

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