Added mbenson commits from master branch
Merged mbenson commit
Better IO Handling
Supressed last comma when apiVersion is not specified in AddonId coords
Reverting Bootstrap to ServiceLocator temporarily
Arquillian test harness now properly reports errors, but might also remove some trace information rarely
Improved Registry signatures
Improving behavior of @Service and @Inject for the case where beans that are not services should be exposed.