Fix override control release note

The override control release note was not in the correct directory meaning it
is not included in doc builds.  Correct this by copying the contents to a
release note file that was included in 11.1.0 so that it will appear along with
the correct version in subsequent doc builds.

Change-Id: I42844d034f21f67830470d4c2a508600612aa99d

releasenotes/notes/zuul-return-validate-5158d5400c8a7dc9.yaml

@@ -1,4 +1,27 @@
 ---
+features:
+  - |
+    Several job attributes may now have their inheritance behavior
+    changed through "override control".  This introduces two new YAML
+    tags, ``!override`` and ``!inherit`` which may be used to
+    explicitly specify whether certain job attributes should inherit
+    values from parent jobs or override them.
+
+    See the general job documentation at :ref:`job` and also
+    documentation for the following individual attributes:
+
+      * :attr:`job.dependencies`
+      * :attr:`job.extra-vars`
+      * :attr:`job.failure-output`
+      * :attr:`job.files`
+      * :attr:`job.group-vars`
+      * :attr:`job.host-vars`
+      * :attr:`job.irrelevant-files`
+      * :attr:`job.provides`
+      * :attr:`job.required-projects`
+      * :attr:`job.requires`
+      * :attr:`job.tags`
+      * :attr:`job.vars`
 fixes:
   - |
     The zuul_return Ansible plugin will now validate the schema of the

zuul/releasenotes/notes/override-control-6e99f0476d73743b.yaml

@@ -1,24 +0,0 @@
----
-features:
-  - |
-    Several job attributes may now have their inheritance behavior
-    changed through "override control".  This introduces two new YAML
-    tags, ``!override`` and ``!inherit`` which may be used to
-    explicitly specify whether certain job attributes should inherit
-    values from parent jobs or override them.
-
-    See the general job documentation at :ref:`job` and also
-    documentation for the following individual attributes:
-
-      * :attr:`job.dependencies`
-      * :attr:`job.extra-vars`
-      * :attr:`job.failure-output`
-      * :attr:`job.files`
-      * :attr:`job.group-vars`
-      * :attr:`job.host-vars`
-      * :attr:`job.irrelevant-files`
-      * :attr:`job.provides`
-      * :attr:`job.required-projects`
-      * :attr:`job.requires`
-      * :attr:`job.tags`
-      * :attr:`job.vars`