Ref #3484: Make some corrections for workflow

http://www.rudder-project.org/redmine/issues/3484