Fix couple of skipifs when only running a ReplicaSet
Merge Pull Request #536

* bjori-fix-skipifs:
  Fix couple of skipifs when only running a ReplicaSet