Merge "Add metrics-server defaults"