Merging to release-5.8.0: [TT-12957] fixed issue when migrating from classic to oas that was leaving a broken url (#6947)

Merging to release-5.8.0: [TT-12957] fixed issue when migrating from classic to oas that was leaving a broken url (#6947) #1354