Merge conflicts from 'git merge' from devel branch

Change-Id: I3f9ad443e14feaf1aba8485c4b63175f572f565e

diff --cc jobs/create-snapshot/config.xml
index 7a3a141,fb6f1c0..593694b
--- 1/jobs/create-snapshot/config.xml
--- 2/jobs/create-snapshot/config.xml
+++ b/jobs/create-snapshot/config.xml
@@@ -72,6 -72,19 +72,20 @@@
            <block/>
            <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
          </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+           <configs class="empty-list"/>
+           <configFactories>
+             <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+               <filePattern>BUILD-MONITOR-*.env</filePattern>
+               <noFilesFoundAction>SKIP</noFilesFoundAction>
+             </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+           </configFactories>
+           <projects>BUILD-MONITOR</projects>
+           <condition>ALWAYS</condition>
+           <triggerWithNoParameters>false</triggerWithNoParameters>
++          <block/>
+           <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+         </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
        </configs>
      </hudson.plugins.parameterizedtrigger.TriggerBuilder>
      <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
@@@ -134,4 -147,4 +148,4 @@@ if(matcher?.matches()) 
        </info>
      </EnvInjectBuildWrapper>
    </buildWrappers>
--</project>
++</project>

diff --cc packaging/jenkins-jobs.spec
Simple merge