FORGE-1177: Ported servlet setup