Merge branch 'DLS-Release-v1.1.2' into UAT

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -551,7 +551,7 @@ BEGIN TRANSACTION
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
                  {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
-                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId 
+                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId AND SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID
 
                 COMMIT TRANSACTION";