refs #6763. More tolerance on property types.
refs #6763. Fix returns non-workspace.
Merge remote-tracking branch 'origin/feature/6763_signature'