Revert to-string for CNL operating system (#2526)

lib/spack/spack/operating_systems/cnl.py

@@ -22,7 +22,7 @@ def __init__(self):
         super(Cnl, self).__init__(name, version)
 
     def __str__(self):
-        return self.name + self.version
+        return self.name
 
     def find_compilers(self, *paths):
         types = spack.compilers.all_compiler_types()

lib/spack/spack/test/mock_packages_test.py

@@ -66,7 +66,7 @@
     modules: 'None'
 - compiler:
     spec: clang@3.3
-    operating_system: CNL10
+    operating_system: CNL
     paths:
       cc: /path/to/clang
       cxx: /path/to/clang++
@@ -97,7 +97,7 @@
       cxx: /path/to/g++
       f77: /path/to/gfortran
       fc: /path/to/gfortran
-    operating_system: CNL10
+    operating_system: CNL
     spec: gcc@4.5.0
     modules: 'None'
 - compiler: