only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/src/MigrateDrupalServiceProvider.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\MigrateDrupalServiceProvider.
+ */
+
+namespace Drupal\migrate_drupal;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\ServiceProviderBase;
+
+/**
+ * Overrides the migration plugin manager service to add an annotation namespace
+ * for Drupal source plugins.
+ */
+class MigrateDrupalServiceProvider extends ServiceProviderBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function alter(ContainerBuilder $container) {
+    $definition = $container->getDefinition('plugin.manager.migrate.source');
+    $definition->setClass('Drupal\migrate_drupal\Plugin\MigrateDrupalPluginManager');
+  }
+
+}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateDrupalPluginManager.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\MigrateDrupalPluginManager.
+ */
+
+namespace Drupal\migrate_drupal\Plugin;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\migrate\Plugin\MigratePluginManager;
+
+/**
+ * Plugin manager for migration plugins.
+ */
+class MigrateDrupalPluginManager extends MigratePluginManager {
+
+  /**
+   * Constructs a MigratePluginManager object.
+   *
+   * @param string $type
+   *   The type of the plugin: row, source, process, destination, entity_field,
+   *   id_map.
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   * @param string $annotation
+   *   (optional) The annotation class name. Defaults to
+   *   'Drupal\Component\Annotation\PluginID'.
+   */
+  public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, $annotation = 'Drupal\Component\Annotation\PluginID') {
+    parent::__construct($type, $namespaces, $cache_backend, $module_handler, $annotation);
+    $this->additionalAnnotationNamespaces[] = 'Drupal\migrate_drupal\Plugin\Annotation';
+  }
+
+}
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
@@ -15,7 +15,7 @@
 /**
  * Drupal i18n_variable source from database.
  *
- * @MigrateSource(
+ * @MigrateDrupalSource(
  *   id = "i18n_variable"
  * )
  */