refs #8104. This should now fix the defect.

Test demonstrates this working.
refs #8104. Correct error message.
Merge remote-tracking branch 'origin/feature/8104_query_mdworkspace'