Revert "Revert "use filters to find the correct set of hosts, to speed and stabilize""
Revert "Revert "use filters to find the correct set of hosts, to speed and stabilize""

This reverts commit f1d4cc75b9aa7590695315c76ad6a8578d9f6728.

tim-group/orc,tim-group/orc