When finding organisation, match on ID or name

We "improved" the organisation matching to be more precise a while ago, but it then didn't match when searching by membership ID. This has only just been found out, and was previously masked by the cassettes, which can't have been regenerated properly at the time.

We now match on name or membership ID, and the tests all pass without cassettes, which have been regenerated with the new version.

This needs bringing into services-manager once it's reviewed and merged.

Current implication is that storing directory entry data will not succeed until this is integrated. However, the jobs are requeued, so nothing will be lost.