Agpush 445

fix for [AGPUSH-445](https://issues.jboss.org/browse/AGPUSH-445) merge the two persistence-units into one as the separation is superficial as they both use the same data source. But this caused hibernate search to initialise two times and trying to create the index directory the second time fails because it already created the first time.