(bug 1716) "syn_merge" not "synmerge"
(bug 1716) use canonical username in merge interface lookups
Merge pull request #511 from anall/feature/bug1716

Fix two issues with feed merge admin interface.