matrix: Extend and move the auto-joined rooms into the vault

2 jobs for master in 1 minute and 2 seconds (queued for 10 seconds)