Fixing workflow specification to support 'on-task-XXX' clauses

Change-Id: I1a70e1e92b0c9cafae236e46392d97b156d1ec72
Merge "Fixing workflow specification to support 'on-task-XXX' clauses"