Add support for JDK7 compilation

@rev rjayaramappa@
@bug W-1833165@