Slight change to pr-784
Merge pull request #817 from pwendell/pr_784

Minor clean-up in metrics servlet code