Minor nit – the xml for the new metrics subsystem spreads a single element across several lines while the server when it persists will write on one line.

This is just a minor style nit in that we want the configs we ship to be in the same format that the management layer would write. All the <!-- ## FOO ## --> stuff completely blows that out of the water anyway, so this is optional to correct.