PLUMBER2 wetland sites fail at case creation

[olyson]

Brief summary of bug

PLUMBER2 wetland sites fail at case creation because baseflow_scalar is set in user_nl_clm in the usermods and baseflow_scalar is now on the parameter file.

General bug information

CTSM version you are using: ctsm5.4.039

Does this bug cause significantly incorrect results in the model's science? Wetland sites can't be run

Details of bug

Wetland sites are:

        "CZ-wet",
        "DE-SfN",
        "FI-Kaa",
        "FI-Lom",
        "RU-Che",
        "SE-Deg",
        "US-Los",
        "US-Myb",
        "US-Tw4",
        "PL-wet",

Reported error is:

ERROR: Command /glade/work/oleson/ctsm5.4.039/bld/build-namelist failed rc=255
out=
err=Attempt to call undefined import method with arguments ("main") via package "CLMBuildNamelist" (Perhaps you forgot to load the package?) at /glade/work/oleson/ctsm5.4.039/bld/build-namelist line 21.
ERROR : CLM build-namelist::CLMBuildNamelist::process_namelist_infile() : Invalid namelist variable in '-infile' /glade/work/oleson/ctsm5.4.039/tools/site_and_regional/CZ-wet/Buildconf/clmconf/namelist.
 ERROR: in _validate_pair (package Build::NamelistDefinition): Variable name baseflow_scalar not found in /glade/work/oleson/ctsm5.4.039/bld/namelist_files/namelist_definition_drv.xml, /glade/work/oleson/ctsm5.4.039/bld/namelist_files/namelist_definition_drv_flds.xml, /glade/work/oleson/ctsm5.4.039/bld/namelist_files/namelist_definition_ctsm.xml

Important details of your setup / configuration so we can reproduce the bug

cd tools/site_and_regional
./run_tower --plumber-sites CZ-wet --run-type ad