Revert "Resolve conflicts"
Related merge request !814 to merge release-1.15.x
merge request
3 jobs
18 minutes 54 seconds, queued for 7 seconds
UNCLASSIFIED - NO CUI
Currently supported Big Bang Version is 2.50
UNCLASSIFIED - NO CUI