Issue #2381763 by chx, webflo: Adjust the order of container yamls to override settings per environment