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

Param-build results: http://messaging-09.jbm.lab.bos.redhat.com:8080/job/hornetq-param/744/#showFailuresLink

Mostly expected failures.  Those that weren't expected either still failed without my commit or succeeded locally with my commit.