Updated Merge for Fix Glassfish-21175 to prevent spurious thread wakeups