suppressed blank lines
Corrected loadonstartup for metrics servlet
Merge remote-tracking branch 'origin/master'