Allow default content disposition to be overridden
Remove redundant fallback
Improve inline documentation
Merge pull request #614 from peterkeung/default-content-disposition

Fix for EZP-20741: Allow default content disposition to be overridden