Merge branch 'master' into REL1_36

* master:
  Disable cp10/cp11 in wgCdnServers (#3919)
  Removing a deprecated option I added by mistake (#3930)
  Enable MP3 for my site using TimedMediaHandler (#3928)
  add mma, mmf, mmt file types to MWS per T7376 (#3927)
  Set wgOnlyUserEditUserPage (#3925)
  Add protection/restriction level to hypopediawiki (#3924)

LocalSettings.php

@@ -2124,6 +2124,7 @@
 		],
 		'vgportdbwiki' => [
 			'Unverified_Games' => 'unverified',
+			'Incomplete_Pages' => 'unverified',
 		],
 	],
 
@@ -2697,6 +2698,9 @@
 			'bureaucrat' => [
 				'bureaucrat' => true,
 			],
+			'extendedconfirmed' => [
+				'editextendedconfirmedprotected' => true,
+			],
 		],
 		'+igrovyesistemywiki' => [
 			'autopatrolled' => [
@@ -3703,6 +3707,7 @@
 		],
 		'+hypopediawiki' => [
 			'bureaucrat',
+			'editextendedconfirmedprotected',
 		],
 		'+igrovyesistemywiki' => [
 			'trusted',
@@ -3779,6 +3784,9 @@
 			'editextendedconfirmedprotected',
 			'edittemplateprotected',
 		],
+		'hypopediawiki' => [
+			'editextendedconfirmedprotected',
+		],
 		'lhmnwiki' => [
 			'editextendedconfirmedprotected',
 		],
@@ -4227,15 +4235,20 @@
 		'default' => false, // DO NOT set to true under any circumstances --Reception123
 	],
 
+	// UserPageEditProtection
+	'wgOnlyUserEditUserPage' => [
+		'wmgUseUserPageEditProtection' => true,
+	],
+
 	// Vanish (MW 1.34+)
 	'wgUseCdn' => [
 		'default' => true,
 	],
 	'wgCdnServers' => [
 		'default' => [
 			'128.199.139.216:81', // cp3
-			'51.195.236.219:81', // cp10
-			'51.195.236.250:81', // cp11
+			// '51.195.236.219:81', // cp10
+			// '51.195.236.250:81', // cp11
 			'51.222.25.132:81', // cp12
 			'51.38.69.175:81', // cp13
 		],

ManageWikiSettings.php

@@ -1069,6 +1069,9 @@
 			'md' => 'md',
 			'mid' => 'mid',
 			'midi' => 'midi',
+			'mma' => 'mma',
+			'mmf' => 'mmf',
+			'mmt' => 'mmt',
 			'mkv' => 'mkv',
 			'mod' => 'mod',
 			'mov' => 'mov',