Handle SnF queues on nodes that don't receive the scale-down
Merge pull request #1682 from jbertram/master-snf-refactor

Handle SnF queues on nodes that don't receive the scale-down