Automatic merge from submit-queue

Revert revert of adding resource constraints for master components in density tests

The problem was the time when resource constraints were generated. It turns out that the provider is not set there. This version should work.

cc @roberthbailey @alex-mohr