SERVER-3820: fixed by matcher refactor
SERVER-4517: update test
modest ( ~ !10% ) compile time speedup by some small header cleanup