fix colocated fail-over tests; fix SnF-to-SnF scale-down
Merge pull request #1707 from jbertram/master-snf2snf

fix colocated fail-over tests; fix SnF-to-SnF scale-down