Merge proposals dependent on lp:~develop7/synapse-project/ssh-plugin-proper-wildcards-and-dupes-handling

1. ssh-plugin-proper-wildcards-and-dupes-handling
2. Dependent merge proposals