Merge topic 'watcom-workaround'

ceebac93 Tests: Restore fix to Plugin test on Watcom compiler

Tests/Plugin/src/example_exe.cxx

@@ -31,7 +31,9 @@ int main()
   kwsys::DynamicLoader::LibraryHandle handle =
     kwsys::DynamicLoader::OpenLibrary(libName.c_str());
   if (!handle) {
-    std::cerr << "Could not open plugin \"" << libName << "\"!" << std::endl;
+    // Leave the .c_str() on this one.  It is needed on OpenWatcom.
+    std::cerr << "Could not open plugin \"" << libName.c_str() << "\"!"
+              << std::endl;
     return 1;
   }
   kwsys::DynamicLoader::SymbolPointer sym =