Fix a bug to count number of splitted workspaces.  Refs #6650.
Merge branch 'feature/6650_powder_redux' into develop