Remove jdk7 dependency

merge from release-24