Re-introduce basic resource injection point validation
Prevent memory usage overhead from pointless string interpolation; also clean up a couple of pointless trace logging constructs
Change weld to use new contextId based API