[OLINGO-607] Fix for JDK8 build issues
6 files changed