Wild card imports replaced by specific imports
Merge pull request #1324 from atsareg/fix_wf

[v6r8] Wild card import fixes in Workflow