NXP-15039 sonar code clean
NXP-15039: Refactor ES NXQL PP extending from CoreQuery PP, keep Native PP impl