Merge branch 'develop' into gh-232-nlu

Author: mediumTaj

Config.json.enc

@@ -2362,7 +2362,6 @@ private void OnCheckService(GetClassifiersPerClassifierVerbose classifier, strin
           m_GetClassifierCount -= 1;
           if (classifier != null)
           {
-            Log.Debug("VisualRecognition", "classifier status: {0}", classifier.status);
             if (classifier.status == "unavailable" || classifier.status == "failed")
             {
               Log.Debug("VisualRecognition", "Status of classifier {0} came back as {1}.", classifier.classifier_id, classifier.status);

Scripts/Services/VisualRecognition/VisualRecognition.cs

@@ -29,7 +29,7 @@ public class TestDiscovery : UnitTest
 
         //  Environment
         private string m_CreatedEnvironmentName = "unity-sdk-integration-test";
-        private string m_CreatedEnvironmentDescription = "Integration test running for Unity SDK. Please do not delete this environment until 10 minutes after the status is 'active'. The test should delete this environment.";
+        private string m_CreatedEnvironmentDescription = "Integration test running for Unity SDK. Please do not delete this environment until 10 minutes after the status is active. The test should delete this environment.";
         private string m_CreatedEnvironmentID;
         private bool m_IsEnvironmentActive = false;
 

Scripts/UnitTests/TestDiscovery.cs

@@ -96,6 +96,8 @@ public class TestRetrieveAndRank : UnitTest
 
     public override IEnumerator RunTest()
     {
+      LogSystem.InstallDefaultReactors();
+
       m_IntegrationTestClusterConfigPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/RetrieveAndRank/cranfield_solr_config.zip";
       m_IntegrationTestRankerTrainingPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/RetrieveAndRank/ranker_training_data.csv";
       m_IntegrationTestRankerAnswerDataPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/RetrieveAndRank/ranker_answer_data.csv";