Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Merge branch 'master' into Olingo-317_DeSerializerRefactoring