[master] Fix many or all 'cannot commit to disk after 5 attempts' problems