SERVER-13022

Backport of SERVER-13022 to 2.6