SERVER-13635: fix scale option with dbstats command
SERVER-13640: disable capped unit test failin in DEBUG more at the moment
SERVER-13640: fix capped collections with records < 8 bytes, re-enable test
Merge remote-tracking branch 'upstream/master'