Tweaks from testing against Dendrite#867

neilalexander wants to merge 1 commit intodevelopmatrix-org/matrix-ios-sdk:developfrom

neilalexander/testagainstdendritematrix-org/matrix-ios-sdk:neilalexander/testagainstdendriteCopy head branch name to clipboard