Merge branch 'stable-2.5' into stable-2.6

* stable-2.5:
  Fix parallel build failures
  QA: Add default setting for tests

Conflicts:
        Makefile.am (expected, from the parallel build fixes)
        qa/qa_config.py (due to cherry-pick, ignored, simply checkout out with --ours)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc Makefile.am
index 84605b5,669e614..a3e9563
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -160,19 -151,16 +160,19 @@@ CLEANFILES = 
        .hpc/*.mix htools/*.tix \
        doc/hs-lint.html
  
- # BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
- # it'll cause the target to rebuild every time.
+ # BUILT_SOURCES should only be used as a dependency on phony
+ # targets. Otherwise it'll cause the target to rebuild every time.
  BUILT_SOURCES = \
 +  $(built_base_sources) \
 +      $(BUILT_PYTHON_SOURCES) \
 +      $(PYTHON_BOOTSTRAP)
 +
 +built_base_sources = \
        ganeti \
        stamp-srclinks \
 -      $(all_dirfiles) \
 -      $(PYTHON_BOOTSTRAP) \
 -      $(BUILT_PYTHON_SOURCES)
 +      $(all_dirfiles)
  
 -BUILT_PYTHON_SOURCES = \
 +built_python_base_sources = \
        lib/_autoconf.py \
        lib/_vcsversion.py
  
@@@ -999,13 -831,11 +999,17 @@@ man/footer.html: man/footer.rs
        $(PANDOC) -f rst -t html -o $@ $<
  
  man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
-       lib/build/shell_example_lexer.py
++      lib/build/shell_example_lexer.py \
+       | $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
 +      @echo "Checking $< for hardcoded paths..."
 +      @if grep -nEf autotools/wrong-hardcoded-paths $<; then \
 +        echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
 +        exit 1; \
 +      fi
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@
+       set -e ; \
+       trap 'echo auto-removing $@; rm $@' EXIT; \
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+       trap - EXIT
  
  man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
        @test -n "$(PANDOC)" || \