* commit '1501de59ed74802f48e32b0657fc6c95997b264a': (3648 commits)
  Package/py-lmfit: add new version (spack#16975)
  hpctoolkit: add version 2020.06.12 (spack#17081)
  add dependency for icd variant, or else build fails (spack#17079)
  clang: add 'version_argument', remove redundant method (spack#17071)
  New package: ocl-icd (spack#17078)
  Reframe 3.0 (spack#17005)
  py-healpy: a new package. (spack#17001)
  New recipe for building the Log4C package (spack#17038)
  fix depends issue and support for aarch64 (spack#17045)
  replace 'no' with 'none' as possible value of 'threads' variant (spack#17063)
  xrootd: new versions (spack#17076)
  add compilers to mpi setup_run_environment methods forall mpi implementations (spack#17015)
  bazel: patch to allow py-tensorflow (and likely other bazel packages) to build. (spack#17013)
  New package: FrontFlow Blue (spack#16901)
  cscope: Link tinfow instead of tinfo
  New package: alps (spack#17023)
  pygpu: fix linking with gpuarray (spack#17033)
  libtree package: add version 1.2.0, 1.1.4, and 1.1.3 (spack#17035)
  Buildcache: Fix bug in binary string replacement (spack#17075)
  New package: clinfo (spack#17042)
  ...

# Conflicts:
#	.gitignore
#	lib/spack/spack/binary_distribution.py
#	lib/spack/spack/modules/common.py
#	var/spack/repos/builtin/packages/med/package.py
#	var/spack/repos/builtin/packages/mofem-cephas/package.py
#	var/spack/repos/builtin/packages/mofem-fracture-module/package.py
#	var/spack/repos/builtin/packages/mofem-users-modules/package.py
#	var/spack/repos/builtin/packages/petsc/package.py
#	var/spack/repos/builtin/packages/python/package.py

Add versions 2020.06.12 and develop.
Switch default for variant papi to true.