Revert change to 'modules/jersey/src/test/resources/basic-conf.xml' to avoid conflict with 4.x branch