BZ1016853: Fixes for ejb-multi-server quickstart