[OLINGO-317] Merged the format ENUMs
Merge branch 'master' into Olingo-317_DeSerializerRefactoring
[OLINGO-317] Refactored ContentType
[OLINGO-317] Minor ContentType refactoring
[OLINGO-327] make client supports shorter operation name in url (not protocol standard)
[OLINGO-317] Fixed incompatible test
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Merge branch 'master' of https://github.com/apache/olingo-odata4

Conflicts:
	lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java