daemon/config: Reload(): normalize labels before validation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

daemon/config/config.go

@@ -343,10 +343,6 @@ func Reload(configFile string, flags *pflag.FlagSet, reload func(*Config)) error
 		newConfig = New()
 	}
 
-	if err := Validate(newConfig); err != nil {
-		return errors.Wrap(err, "file configuration validation failed")
-	}
-
 	// Check if duplicate label-keys with different values are found
 	newLabels, err := GetConflictFreeLabels(newConfig.Labels)
 	if err != nil {
@@ -354,6 +350,10 @@ func Reload(configFile string, flags *pflag.FlagSet, reload func(*Config)) error
 	}
 	newConfig.Labels = newLabels
 
+	if err := Validate(newConfig); err != nil {
+		return errors.Wrap(err, "file configuration validation failed")
+	}
+
 	reload(newConfig)
 	return nil
 }