Error handling API should use same version of hibernate JPA; revert back to 1.6 compiling as before
More cleanup after merge