SERVER-16431 Simplify DB profile code
Merge remote-tracking branch 'upstream/master'