Merge pull request #1985 from kgaillot/rhbz1760669
Scheduler fixes related to dependent resource effects