Use nfreeze and nthaw instead of freeze and thaw
Grab more updates from Peter
Revert  thaw back to thaw
Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev into ww2.5.2