Changes from spack#1706

white238 wants to merge 2 commits intodevelopllnl/axom:developfrom

task/white238/merge_spack_changesllnl/axom:task/white238/merge_spack_changesCopy head branch name to clipboard