FORGE-1290: Split JPAFacet
Applied latest aesh changes