Refs #7114 Files moved and modified
Refs #7114 Correct renaming of test file
Merge remote-tracking branch 'origin/feature/7114_ModeratorTzeroLinear'