[OLINGO-260] fix for integration test deadlock
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Various small improvements, added test for instance annotations
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4