WELD-1658 Extensive refactoring of weld-se and weld-servlet