Merge branch 'rsmpbs' of code.ornl.gov:jap/rsm into rsmpbs

4 jobs for rsmpbs in 4 minutes and 26 seconds (queued for 1 second)