Merge remote branch 'origin/bugfix/6277_try'
Update system test.  Refs #6650.
Merge branch 'feature/6650_powder_redux' into develop