Fix calculation of milestone.
Remove milestone calculation from standalone.
Applied changes to jdk7 & jdk 9.