SERVER-13635 engine-specific component in collection options
Merge remote-tracking branch 'upstream/master'