fix import conflicts after last not synced merge

Rustam Lotsmanenko (EPAM)requested to merge
fix-compile into master

MR: !530 (merged) was not synchronized with the master branch prior merge. Conflict in imports causes compile failure.

Edited by Rustam Lotsmanenko (EPAM)

Merge request reports