WELD-1476 Eliminate Container.instance() usage
WELD-1475 minor changes