Merge branch 'lassen' of code.ornl.gov:exadigit/raps into lassen