[OE-3987] migration fixes
Merge branch 'develop' of github.com:openeyes/OphTrConsent into develop