JJB cleanups for VOLTHA.

Misc/
  o yaml lint clenaups
  o Remove prototype voltha-2.{9,10,11} job placeholders.
  o Replace mainatiner email address (Matteo) with build system group.

Change-Id: I37e1175f56042632753b75c849dbaf07f74bd284
diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index 39517ab..1da49a0 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -114,29 +114,29 @@
     name: cord-infra-github-pr-trigger-merge
     triggers:
       - generic-webhook-trigger:
-            post-content-params:
-                - type: JSONPath
-                  key: action
-                  value: $.action
-                - type: JSONPath
-                  key: merged
-                  value: $.pull_request.merged
-                - type: JSONPath
-                  key: repoUrl
-                  value: $.pull_request.base.repo.html_url
-                - type: JSONPath
-                  key: repoName
-                  value: $.pull_request.base.repo.name
-                - type: JSONPath
-                  key: branchName
-                  value: $.pull_request.base.ref
-                - type: JSONPath
-                  key: commitHash
-                  value: $.pull_request.merge_commit_sha
-            regex-filter-text: $action,$merged
-            regex-filter-expression: ^(closed,true)$
-            cause: Generic Cause
-            token: '{project}'
+          post-content-params:
+            - type: JSONPath
+              key: action
+              value: $.action
+            - type: JSONPath
+              key: merged
+              value: $.pull_request.merged
+            - type: JSONPath
+              key: repoUrl
+              value: $.pull_request.base.repo.html_url
+            - type: JSONPath
+              key: repoName
+              value: $.pull_request.base.repo.name
+            - type: JSONPath
+              key: branchName
+              value: $.pull_request.base.ref
+            - type: JSONPath
+              key: commitHash
+              value: $.pull_request.merge_commit_sha
+        regex-filter-text: $action,$merged
+        regex-filter-expression: ^(closed,true)$
+        cause: Generic Cause
+        token: '{project}'
 
 # wrapper to provide pypi config file
 
@@ -161,8 +161,6 @@
               target: '$HOME/.config/pip/pip.conf'
 
 
-
-
 ################## NEW and CONVERGED MACROS ###################
 # Name matches macro in ONOS/Aether JJB, for future unification