Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration

# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java

hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface FieldNameProvider {
     /**
-     * Seperator for the sub attributes
+     * Separator for the sub attributes
      */
     public static final String SUB_ATTRIBUTE_SEPERATOR = ".";
 

hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeFields.java

@@ -36,7 +36,7 @@ public enum SoftwareModuleTypeFields implements FieldNameProvider {
     /**
      * The max ds assignments field.
      */
-    MAX("maxAssignments");
+    MAXASSIGNMENTS("maxAssignments");
 
     private final String fieldName;