Merge remote-tracking branch 'origin/feature/10015_settings_reset_mechanism'
Refs #10329. Fix linking issues and failed unit test.
Merge branch 'feature/10329_fix_boost_1p56' into develop