Merge proposals dependent on lp://staging/~therp-nl/openupgrade-server/7.0-lp1131653_check_recursion_fix_false_positives

1. 7.0-lp1131653_check_recursion_fix_false_positives
2. Dependent merge proposals