ISIS-537, ISIS-946 Explicitly specify servlet-api as a dependency