Merge remote-tracking branch 'anastasia/development' into upstream-dev

* anastasia/development:
  FLUID-4624: Update item in navigation menu to reflect new page name
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'master' into development
FLUID-5569: Updating the mediawiki version to 1.19.21
Merge branch 'master' into development
Merge branch 'mediawiki-clean' into development

Conflicts:
	RELEASE-NOTES-1.19
	extensions/Vector/modules/images/closed-rtl.png
	extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png
	includes/DefaultSettings.php
	includes/Export.php
	includes/OutputPage.php
	includes/Sanitizer.php
	includes/XmlTypeCheck.php
	includes/api/ApiFormatBase.php
	includes/installer/Installer.php
	includes/upload/UploadBase.php
	resources/jquery/images/sort_none.gif
	skins/floe/IE50Fixes.css
	skins/floe/IE55Fixes.css
	skins/floe/rtl.css
	tests/parser/parserTests.txt
	tests/parserTests.php
	tests/phpunit/includes/CdbTest.php
	tests/phpunit/includes/LocalFileTest.php
	tests/phpunit/includes/RevisionTest.php
	tests/phpunit/includes/SiteConfigurationTest.php
	tests/phpunit/includes/TimeAdjustTest.php
	tests/phpunit/includes/media/MediaHandlerTest.php
	tests/phpunit/includes/normal/CleanUpTest.php
	tests/phpunit/includes/search/SearchUpdateTest.php
FLUID-5569: Updating mediawiki to 1.19.21
Merge branch 'development'