Dmz

There is one commit we can revert once the scenario_node_terminus correctly supports handling unset facts on nodes that don't need them, but since test are currently broken by that issue, I would like this merged, then changed back once the issues are gone and tests are passing again.