Merge pull request #23 from smillidge/master

Fix Build
Merge Fix for Glassfish-21175
Updated Merge which addresses Glassfish-21175
Updated Merge for Fix Glassfish-21175 to prevent spurious thread wakeups
Spurious Wakeup Fix for Glassfish-21175
Merge pull request #30 from smillidge/master

Pull in latest hk2
Merge pull request #24 from davewinters/master

Fix #10 Merge in fix for Glassfish-21175