Made it compile with java versions > 8 (this is I think a backport)

Made it compile with java versions > 8 (this is I think a backport) #7