Run tests on Tomcat 8 (#12326)

Change-Id: I99d91f16c5ad2dce6fb93f2862913b23518410d7