settings: add prefs for 7.0, and remove prefs for 6.0
settings: add prefs for 7.0, and remove prefs for 6.0

boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite