Change snow_thermal_cond_glc_method and _lake_method for clm6_0

Author: slevis-lmwg

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -484,13 +484,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <snow_thermal_cond_method>Jordan1991</snow_thermal_cond_method>
 <snow_thermal_cond_method phys="clm6_0">Sturm1997</snow_thermal_cond_method>
 
-<!-- TODO change clm6 to Jordan with answer changing tag for glacier mass ballance -->
 <snow_thermal_cond_glc_method>Jordan1991</snow_thermal_cond_glc_method>
-<snow_thermal_cond_glc_method phys="clm6_0">Sturm1997</snow_thermal_cond_glc_method>
+<snow_thermal_cond_glc_method phys="clm6_0">Jordan1991</snow_thermal_cond_glc_method>
 
-<!-- TODO change clm6 to Sturm with answer changing tag -->
 <snow_thermal_cond_lake_method>Jordan1991</snow_thermal_cond_lake_method>
-<snow_thermal_cond_lake_method phys="clm6_0">Jordan1991</snow_thermal_cond_lake_method>
+<snow_thermal_cond_lake_method phys="clm6_0">Sturm1997</snow_thermal_cond_lake_method>
 
 <!-- Default glacier behavior is:
      Mountain glaciers: single_at_atm_topo