Merge branch 'master' into 'sudo'

# Conflicts:
#   build.bash
#   packages/packagePostInstall.bash
#   packages/packagePostRemove.bash
2 jobs for <span class="ref-name">sudo</span> in 43 seconds
Status Job ID Name Coverage
  Build
passed #21215
ornltoolbox-builder
ornltoolbox-build

00:00:23

 
  Deploy
passed #21216
repoman
repoman

00:00:20