Merge branch 'hotfix' into develop

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java

@@ -37,7 +37,7 @@ public class ClientModifySupportImpl implements ClientModifySupport {
 
     @Override
     public void processClientConfigModify(ClientConfigModify clientConfigModify) {
-        int clientId = clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate);
+        int clientId =clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate);
         clientInfoCacheSupport.clearClientCache(clientId);
     }
 }