refs #374, fix test to make sure original primary does not step down
Merge branch 'bugs/374b' into releases/1.0