Some code coverage analysis showed some outages.  hk2-locator down to 88%,
trying to get it higher than 90 again
Merge branch 'master' of ssh://git.java.net/hk2~git