Use account muc_nick when no nick for bookmark
Merge branch 'master' into xep-0223