Still reducing spring dependencies in classes not directly related with Spring MVC
Moving back OpenJPA enhancement back to the really correct place