SERVER-13989: clean up quota api
Merge remote-tracking branch 'upstream/master'