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
Manual installation of some basic packages is needed for tox -e zuul,
otherwise you'll get the following errors:
unable to execute 'x86_64-linux-gnu-gcc': No such file or directory
netifaces.c:1:20: fatal error: Python.h: No such file or directory
Change-Id: If112637e70db88dcf91b30f0d564f180633f92bf