[OLINGO-328] fix pom error
[OLINGO-340] Fix
[OLINGO-341] Fix
[OLINGO-317] Merge with current master