Refs #3289: Rework order in site.cf and failsafe.cf