Using normal PersistenceContext

No need for extended PersistenceContext

Tested the server (creating app/variant, registering tokens and sending).


@edewit @sebastienblanc can you review?

Needs to be merged to 1.0.x and master branches