Removed calling function Workspace->setName().  Refs #7333.
Resolved conflict.  Refs #7333.