Merge branch '4.19' into 4.20

Author: DaanHoogland

engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java

@@ -199,7 +199,7 @@ public void removeUserFromProjects(long userId) {
 
         int removedCount = remove(sc);
         if (removedCount > 0) {
-            s_logger.debug(String.format("Removed user [%s] from %s project(s).", userId, removedCount));
+            logger.debug(String.format("Removed user [%s] from %s project(s).", userId, removedCount));
         }
     }
 

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1528,7 +1528,7 @@ public void validateUserPasswordAndUpdateIfNeeded(String newPassword, UserVO use
 
         User.Source userSource = user.getSource();
         if (userSource == User.Source.SAML2 || userSource == User.Source.SAML2DISABLED || userSource == User.Source.LDAP) {
-            s_logger.warn(String.format("Unable to update the password for user [%d], as its source is [%s].", user.getId(), user.getSource().toString()));
+            logger.warn(String.format("Unable to update the password for user [%d], as its source is [%s].", user.getId(), user.getSource().toString()));
             throw new InvalidParameterValueException("CloudStack does not support updating passwords for SAML or LDAP users. Please contact your cloud administrator for assistance.");
         }
 

server/src/test/java/com/cloud/user/AccountManagerImplTest.java

@@ -881,7 +881,7 @@ public void validateUserPasswordAndUpdateIfNeededTestSaml2UserShouldNotBeAllowed
 
         Mockito.when(userVoMock.getSource()).thenReturn(User.Source.SAML2);
 
-        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword);
+        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword, false);
     }
 
     @Test(expected = InvalidParameterValueException.class)
@@ -891,7 +891,7 @@ public void validateUserPasswordAndUpdateIfNeededTestSaml2DisabledUserShouldNotB
 
         Mockito.when(userVoMock.getSource()).thenReturn(User.Source.SAML2DISABLED);
 
-        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword);
+        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword, false);
     }
 
     @Test(expected = InvalidParameterValueException.class)
@@ -901,7 +901,7 @@ public void validateUserPasswordAndUpdateIfNeededTestLdapUserShouldNotBeAllowedT
 
         Mockito.when(userVoMock.getSource()).thenReturn(User.Source.LDAP);
 
-        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword);
+        accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, currentPassword, false);
     }
 
     private String configureUserMockAuthenticators(String newPassword) {