make lint not complain about multiline comments
SERVER-939 temporarily remove scoped dist lock tests, currently incompatible with debug builds
fix query optimizer test compile
XXXX one more TODO: to rebase