Document more release todo items.

howto/release/jenkins
---------------------
  o Document LTS view creation.

Misc
----
  o Remove a few stray merge conflict markers that were added.

Change-Id: I5cd30f126383783b826362f100f169d66fe49170
diff --git a/howto/release/jenkins/views.rst b/howto/release/jenkins/views.rst
new file mode 100644
index 0000000..93c4646
--- /dev/null
+++ b/howto/release/jenkins/views.rst
@@ -0,0 +1,28 @@
+Job Views
+=========
+
+LTS
+---
+
+With each major LTS voltha release (v2.11, v2.8) a new jenkins view will
+need to be created.
+
+- Navigate to `jenkins.opencord.org <https://jenkins.opencord.org>`_.
+- Click "New View" from the jenkins UI.
+- Name: VOLTHA-X.Y
+- Job filters
+
+  - Click "Use a regular expression to include jobs into the view"
+  - Regular expression: .*voltha.*[_-]2\.11.*
+
+    - Match branch name voltha-2.11
+
+      - `verify_bbsim-sadis-server_sanity-test-voltha-2.11 <https://jenkins.opencord.org/view/VOLTHA-2.11/job/verify_bbsim-sadis-server_sanity-test-voltha-2.11>`_
+
+    - Match derived job name voltha_2.11
+
+      - `verify_berlin-community-pod-1-gpon-adtran_Default_DT_voltha_2.11_dmi <https://jenkins.opencord.org/view/VOLTHA-2.11/job/verify_berlin-community-pod-1-gpon-adtran_Default_DT_voltha_2.11_dmi>`_
+
+    - Match derived job name: voltha.*2.11
+
+      - `periodic-voltha-test-bbsim-2.11 <https://jenkins.opencord.org/view/VOLTHA-2.11/job/periodic-voltha-test-bbsim-2.11>`_