[HIVECLS] Improvements to MIME types by Jared Smudde. CORE-9762