Add extra workspace in Elwin output. Refs #6425
Fix bug in ConjoinWorkspace call in indrect data analysis. Refs #6426