Merge 20.11.0 to develop

Author: labkey-teamcity

OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncRunner.java

@@ -60,6 +60,7 @@
 import static org.labkey.openldapsync.ldap.LdapSettings.DEFAULT_UID_VAL;
 import static org.labkey.openldapsync.ldap.LdapSettings.DISPLAYNAME_FIELD_PROP;
 import static org.labkey.openldapsync.ldap.LdapSettings.FIRSTNAME_FIELD_PROP;
+import static org.labkey.openldapsync.ldap.LdapSettings.DEFAULT_IM_VAL;
 
 /**
  * User: bimber
@@ -876,6 +877,7 @@ private MockLdapEntry getUserEntry(String email, LdapSettings settings) throws E
             props.put(DEFAULT_PHONE_VAL, "(123) 456-7890");
             props.put(DEFAULT_FIRST_NAME_VAL, "Test");
             props.put(DEFAULT_LAST_NAME_VAL, "User");
+            props.put(DEFAULT_IM_VAL, "IMTest");
 
             String dn = "uid=" + ve.getPersonal() + ",cn=users,dc=example,dc=com";
 
@@ -1155,6 +1157,12 @@ protected String getAttribute(String alias)
                 return _otherProps.get(alias);
             }
 
+            @Override
+            public String getIM()
+            {
+                return _otherProps.get(DEFAULT_IM_VAL);
+            }
+
             @Override
             public boolean isEnabled()
             {