Merge branch '8876-work-unit' into 8650-container-work-unit

Conflicts:
	apps/workbench/test/unit/work_unit_test.rb

diff --cc apps/workbench/test/unit/work_unit_test.rb
index 6d31b74be213daf86da5173ed2a9669c8044009f,e8af04c330f786351864291bae34597f4ef777de..f00644ee3ef1d03c6f54e486293923f2011e02cb
--- 1/apps/workbench/test/unit/work_unit_test.rb
--- 2/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@@ -6,11 -10,10 +10,11 @@@ class WorkUnitTest < ActiveSupport::Tes
      [PipelineInstance, 'pipeline_in_running_state', nil, 1, "Running", nil, 0.0],
      [PipelineInstance, 'has_component_with_completed_jobs', nil, 3, "Complete", true, 1.0],
      [PipelineInstance, 'pipeline_with_tagged_collection_input', "pwu", 1, "Ready", nil, 0.0],
-   ].each do |type, name, label, num_children, state, success, progress|
-     test "children of #{name}" do
 +    [Container, 'requester', 'cwu', 3, "Complete", true, 1.0],
 -      use_token 'active'
+   ].each do |type, fixture, label, num_children, state, success, progress|
+     test "children of #{fixture}" do
-       obj = find_fixture(type, name)
 +      use_token 'admin'
+       obj = find_fixture(type, fixture)
        wu = obj.work_unit(label)
  
        if label != nil