Fixes #2945 - Return value modified to return an empty block name when an output file name is forced for r7_moose/raven
Renamed [Outputs] related items (closes #2875)
Merge pull request #2948 from bobkinl/fix_2945

Fix RELAP-7/RAVEN mesh output hack in peacock.
Merge pull request #2955 from aeslaughter/rename-2875

Renamed [Outputs] related items