(bug 52193) Pass back siteid for conflicting links

Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb
Merge "(bug 52193) Pass back siteid for conflicting links"