Fixing merge
Fixing test
Fixing tests
Fixing the responder
fixing test
Ignoring test for now, we have an issue for it
Making sure that we don't eagerly optimize map/reduce indexes using the collection etag too early
disabling test temporarily