[OLINGO-326] URIbuilder issue on android, and uri format issue of addressing derived types
Merge branch 'master' into Olingo-317_DeSerializerRefactoring
[OLINGO-317] Refactored ContentType