Fixed issue where always new entity manager instances were injected into beans or property sets.

Change-Id: Ifd9ccd0eff8f688438d8bfc5984dbff35c4a0a4e