Fixing bad merge
Fix and enable general and user settings tests.

Conflicts:
	core/test/functional/client/settings_test.js