HK2-166, HK2-168 and revert of the cache fix, it breaks upstream jobs in
GlassFish.  I think I know why
Merge branch 'master' of ssh://git.java.net/hk2~git