refs #6612 - fixing test
Merge branch 'master' into deprecate_usersettings