merge-failure has become merge-conflict in pipeline reporting
configurations. The old syntax has been deprecated and will be removed
soon. Update our examples to match current expectations.
Change-Id: I7b3f07d071d52e4e6fe906e9037b489ae2455b43
The subject was clearly for silent jobs only, which makes sense.
Emails in normal operation are likely to result in filters or ignoring
of the emails, so remove the automatic email from success or failure
for normal check jobs
Change-Id: I5193557de3612211c4d1597d7590ed2f05852f35