Fix unit tests for non-english locales
Merge remote-tracking branch 'upstream/master' into test-window-en-locale

Conflicts:
	test/spec/FindReplace-test.js
Merge pull request #8995 from MarcelGerber/test-window-en-locale

Fix unit tests for non-english locales
corrected typo in 'bootstrapping'
Merge remote-tracking branch 'upstream/master'