Refreshed the back-porting from java8 to java7. This is now in step with EqualExperts/opslogger