Merge "Fix assertTrue SONAR issues in apex-pdp/contex and apex-pdp/core"