merge doctrine/mongodb-odm #680 into shard

This gets rid of the need to have a separate branch of `doctrine/mongodb-odm`. It simplifies composer quite a lot.