Ensured default error handling can be stopped as indicated by the javadocs on ErrorCallback
Fixed ERRAI-599: Client side CDI module cannot be used without the server side weld integration module
Merge branch '2.4'