Fixed some remaining bugs related to reseting forceskip to zero that were missing in PR 671
Fixed some remaining bugs related to reseting forceskip to zero that
were missing in PR 671

UW-Hydro/VIC,UW-Hydro/VIC,UW-Hydro/VIC