Replace ContentDispositionUtil with official version and correct license