Revert commit for GateIn 3.5.2.Final and JCR 1.15.2-GA upgrade (introduced during unified-search merge)