Upgrade to artemis-odb-contrib and artemis-odb 0.7.1