* Revert "Make sure the default for EnforceMetricName is 

 (#518)"

This reverts commit 199746a1.

* Fix overrides unmarshalling properly

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>