Also sync up to master and 5.1.x on refactorings in ContentDisposition and ContentDispositionTests. Closes gh-24230