Merge "Introduce ExternalStoreFactory"

diff --combined autoload.php
index edac2c5,89c4473..a998e9a
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -454,6 -454,7 +454,7 @@@ $wgAutoloadLocalClasses = 
        'ExtensionRegistry' => __DIR__ . '/includes/registration/ExtensionRegistry.php',
        'ExternalStore' => __DIR__ . '/includes/externalstore/ExternalStore.php',
        'ExternalStoreDB' => __DIR__ . '/includes/externalstore/ExternalStoreDB.php',
+       'ExternalStoreFactory' => __DIR__ . '/includes/externalstore/ExternalStoreFactory.php',
        'ExternalStoreHttp' => __DIR__ . '/includes/externalstore/ExternalStoreHttp.php',
        'ExternalStoreMedium' => __DIR__ . '/includes/externalstore/ExternalStoreMedium.php',
        'ExternalStoreMwstore' => __DIR__ . '/includes/externalstore/ExternalStoreMwstore.php',
@@@ -1591,10 -1592,10 +1592,10 @@@
        'WantedQueryPage' => __DIR__ . '/includes/specialpage/WantedQueryPage.php',
        'WantedTemplatesPage' => __DIR__ . '/includes/specials/SpecialWantedtemplates.php',
        'WatchAction' => __DIR__ . '/includes/actions/WatchAction.php',
 -      'WatchedItem' => __DIR__ . '/includes/WatchedItem.php',
 -      'WatchedItemQueryService' => __DIR__ . '/includes/WatchedItemQueryService.php',
 -      'WatchedItemQueryServiceExtension' => __DIR__ . '/includes/WatchedItemQueryServiceExtension.php',
 -      'WatchedItemStore' => __DIR__ . '/includes/WatchedItemStore.php',
 +      'WatchedItem' => __DIR__ . '/includes/watcheditem/WatchedItem.php',
 +      'WatchedItemQueryService' => __DIR__ . '/includes/watcheditem/WatchedItemQueryService.php',
 +      'WatchedItemQueryServiceExtension' => __DIR__ . '/includes/watcheditem/WatchedItemQueryServiceExtension.php',
 +      'WatchedItemStore' => __DIR__ . '/includes/watcheditem/WatchedItemStore.php',
        'WatchlistCleanup' => __DIR__ . '/maintenance/cleanupWatchlist.php',
        'WebInstaller' => __DIR__ . '/includes/installer/WebInstaller.php',
        'WebInstallerComplete' => __DIR__ . '/includes/installer/WebInstallerComplete.php',