ARIES-1251 Support jpa2.0 and 2.1 with same code base

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