Master branch: partial fix for ejb-security-propagation quickstart