Add option to display servlet stack traces
Fix race in metrics test case