Manually merge 401cbee95f12238586fd957b4e661d085ed2d2dd

Generate a config that has an identical device-id to what istgt
would use.

Ticket: #5230