Merge persistence_context_and_ejb with master