WELD-1621 Fix ServletContext built-in bean
WELD-1621 Tests