Handle SnF queues on scale-down
Merge pull request #1591 from jbertram/master

Handle SnF queues on scale-down