code cleanup
Merge branch 'master' of github.com:hk2-project/hk2