Merge branch 'master' into larsoft-build

Conflicts:
	config/defaults.cfg
	config/fnal-pkgs.cfg
fix some incorrect automerges
Merge branch 'larsoft-build' into develop