use the right hibernate version that is recommended with search
merge the two persistence-units into one
Revert "use the right hibernate version that is recommended with search"

This reverts commit cae4e7d823eeff84fc264eb459ca7e4417216a6a.