less settings patching (bug 968474)
Merge pull request #1866 from andymckay/968474-cleanup

less settings_test patching (bug 968474)