resolve merge conflicts
scoped pu name is available via EntityManagerFactoryAccess
rename management spi package
more jipijapa spi package name changes