Tyrus-65: Modifying e2e tests to run on both standalone and glassfish