Merge pull request #17442 from jsafrane/fix-predicate-counting-3.8

Automatic merge from submit-queue (batch tested with PRs 16538, 17430, 17432, 17433, 17442).

Fix predicate counting

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1496256

There are two upstream commits here, 53135 was already merged to 3.3 - 3.7, 53989 fixes performance regression that was discovered after merge to 3.7 and earlier.

/assign @mfojtik

Author: openshift-merge-robot