Port commits d0e920a and 6b6773d to 0.6.

This is "add ability to start -hydrology distributed model if bwp is
missing; uses bootstrapping_bwp_value_no_var value" and "Minor cleanup."