Merge "Fix openJdk NET_Wait timeout calculation."