Created attachment 8681 [details] patches cherry-picked from master These need to be applied on top of the other dbcheck patches in bug 9719 and bug 9725.
Comment on attachment 8681 [details] patches cherry-picked from master Looks good
Pushed to autobuild-v4-0-test.
Pushed to v4-0-test. Closing out bug report. Thanks!