CXX-308 Backport server r2.7.4..r2.7.5 changes
minor: fix up mci config nits
CXX-314 Change default shutdown grace period to wait forever