Merge branch 'feature/concise-header-names' of github.com:LLNL/RAJA into feature/concise-header-names