WELD-1704 Fix possible ThreadLocal leak during request and session

context association