HK2 update (to match Glassfish trunk)

Change-Id: I515eca896f18b6cd7ae4d8b9d2b55af1a6f0620f