OLINGO-175 provided patch update and some refactorings