Merge changes Iecbdcdde,I2c1d8be7

* changes:
  Separately bind MimeUtil2 as singleton
  Move MIME type detection to mime package