FL-1413: Cleanup and update Oracle Java 7
FL-1350: Add Oracle Java 8