Gittrac #3532:  Cleaned up the metrics file output as per feedback
from nwp.