DELTASPIKE-745 fix cdictrl-weld to be able to run on new Threads

I also improved OWB ContextControl to behave the same as in weld