syncing hk2 version with glassfish trunk

Change-Id: I40c13e00e61d959861e77a4ef5147a067c19f1b1
Merge "syncing hk2 version with glassfish trunk"