MRQL-67: Fix maven build errors for JDK 1.8
20 files changed