Merge "Fix assertTrue SONAR issues in apex-pdp/examples and apex-pdp/model"