Aries-1134: Enable JPA 2.1 API and correct inconsistent versioning

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