Update instance link formation due to changes in Havana

Fixes-bug: #1262713

Change-Id: I56e174f35ef4a60cffe31b0e619b53845a701ad6