Changed fix for ERRAI-591 to not introduce dep. on Weld and also work with WildFly 8.Beta1