Automatic merge from submit-queue Add resource limits for master resources in density test cc @jlowdermilk @fabioy