Merge "Ensure stop of disk accountant on assertion" into feature/zuulv3