Upgrade hk2 to 2.4.0-b02 and fix the javax.el related dependencies

Change-Id: Icb0e6f1a9645c3e8c889c4e3c9d21c42e6f14288