[OLINGO-317] Minor ContentType refactoring