Issue #2520540 by alexpott: Enforced configuration dependencies shouldn't have to be repeated in the calculated dependencies