ARIES-1006 : Get Aries building on JDK 7 - fixes for Aries parent

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