WFLY-4016 WFLY-4017 EJB context selector fixes