PLINK-130 JPA store refactor
Merge branch 'merge/PLINK-130' of github.com:picketlink/picketlink into merge/PLINK-130

Conflicts:
	modules/idm/impl/src/main/java/org/picketlink/idm/jpa/internal/JPAIdentityStore.java
Merge remote-tracking branch 'upstream/merge/PLINK-130' into merge/PLINK-130