Additional changes to move Jersey to a runtime dep