fixed compile errors related to JDK8u40 update. If you have still on an earlier JDK release, please use the version before this check-in