angular.module('bahmni.common.displaycontrol.custom')             var jitsiMeetingId = $scope.upcomingAppointmentsUUIDs[appointmentIndex];             appService.setTeleConsultationVars(jitsiMeetingId, true);         };+        $scope.showJoinTeleconsultationOption = function (appointmentIndex) {

 public static HtmlForm getHtmlFormFromUiResource(ResourceFactory resourceFactory         return getHtmlFormFromResourceXml(formService, htmlFormEntryService, xml);     } ++    // the new method above with "encounter" is preferred if an encounter is available, see: https://issues.openmrs.org/browse/HTML-768+    public static HtmlForm getHtmlFormFromUiResource(ResourceFactory resourceFactory, FormService formService, HtmlFormEntryService htmlFormEntryService, String providerAndPath) throws IOException {+        // using new Encounter() is a bit of a hack, used for a proper method signature hack; safe because the called method+        // perform a null check on encounter.getForm()+        return getHtmlFormFromUiResource(resourceFactory, formService, htmlFormEntryService, providerAndPath, new Encounter());

 public void controller(@RequestParam(value="patientId", required=false) Patient      */     protected HtmlForm getHtmlFormFromResource(String resource, ResourceFactory rf, FormService fs, HtmlFormEntryService hfs) {         try {+            // TODO figure out how flowsheets might work with: https://issues.openmrs.org/browse/HTML-768

 public static HtmlForm getHtmlFormFromUiResource(ResourceFactory resourceFactory         return getHtmlFormFromResourceXml(formService, htmlFormEntryService, xml);     } ++    // the new method above with "encounter" is preferred if an encounter is available, see: https://issues.openmrs.org/browse/HTML-768+    public static HtmlForm getHtmlFormFromUiResource(ResourceFactory resourceFactory, FormService formService, HtmlFormEntryService htmlFormEntryService, String providerAndPath) throws IOException {+        // using new Encounter() is a bit of a hack, used for a proper method signature hack; safe because the called method+        // perform a null check on encounter.getForm()+        return getHtmlFormFromUiResource(resourceFactory, formService, htmlFormEntryService, providerAndPath, new Encounter());

                 <version>${calculationModuleVersion}</version>                 <scope>test</scope>             </dependency>+

                 <version>${calculationModuleVersion}</version>                 <scope>test</scope>             </dependency>+

 public HttpResponse get(HttpRequestDetails requestDetails) {     }      public HttpResponse get(HttpRequestDetails requestDetails, HttpHeaders httpHeaders) {-        defaultHttpClient = (connectionManager == null) ? new DefaultHttpClient() : new DefaultHttpClient(connectionManager);-        defaultHttpClient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, readTimeout);-        defaultHttpClient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, connectTimeout);          HttpGet httpGet = new HttpGet(requestDetails.getUri());+        RequestConfig requestConfig = RequestConfig.custom()+                .setConnectTimeout(readTimeout)+                .setSocketTimeout(connectTimeout)+                .build();+        if(connectionManager == null) {+            connectionManager = new PoolingHttpClientConnectionManager();+        }+        closeableHttpClient = HttpClientBuilder.create()

             <scope>test</scope>         </dependency>     </dependencies>+    <build>

 public String purgeCalculationRegistration(@ModelAttribute(value = "calculationR 	
 	private void updateSessionMessage(WebRequest request, String code, Object... args) {
 		String msg = Context.getMessageSourceService().getMessage(code, args, Context.getLocale());
-		request.setAttribute(WebConstants.OPENMRS_MSG_ATTR, msg, WebRequest.SCOPE_SESSION);
+		request.setAttribute(WebConstants.OPENMRS_MSG_ATTR, Encode.forHtml(msg), WebRequest.SCOPE_SESSION);

+package org.openmrs.module.coreapps.diagnosisCompatibility;++import org.junit.Assert;+import org.junit.Test;+import org.openmrs.Encounter;+import org.openmrs.api.EncounterService;+import org.springframework.beans.factory.annotation.Autowired;+import org.springframework.beans.factory.annotation.Qualifier;+import org.springframework.stereotype.Component;+++@Component++public class DiagnosisServiceCompatibility2_2Test {+	+	@Autowired+	@Qualifier("encounterService")+	EncounterService encounterService;+	+	/**+	 * @see DiagnosisServiceCompatibility2_2#getDiagnoses(Encounter)+	 */+	+	@Test+	public void getDiagnoses_shouldGetDiagnosesOfTheProvidedEncounter() {+	Encounter encounter = encounterService.getEncounter(3);