Merge branch 'maint-0.4.2' into maint-0.4.3

Remove check-best-practices from check-local in maint-0.4.3.
(The check-local jobs are all on separate lines in 0.4.3.)

diff --cc Makefile.am
index ac61a990fca444d632ed696aadb729343beeb640,eaffbe41a4925647bcced1af0f7c006c1f1fdb1c..8b55bf0e32523e1f3c0e434566ec63b018a4c10e
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -267,13 -245,7 +267,12 @@@ test: al
  shellcheck:
        $(top_srcdir)/scripts/maint/checkShellScripts.sh
  
 -check-local: check-spaces check-changes check-includes shellcheck
 +check-local:                                  \
 +      check-spaces                            \
 +      check-changes                           \
 +      check-includes                          \
-       check-best-practices                    \
 +      shellcheck                              \
 +      check-cocci
  
  need-chutney-path:
        @if test ! -d "$$CHUTNEY_PATH"; then \