[JENKINS-21014] include verify in upstream candidate calculation

Please have a look. I tested the change with various combinations.