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/VERSION b/VERSION
index c7e0a98..35a5840 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.1-dev1
+2.11.1-dev2