HV-884 Switching build to use JDK 8
Merge remote-tracking branch 'origin/master'