Stable release v2.3.6 upgrade bumpiness due to plugin

[gerhard (Gerhard Schlager)]

I fixed the migrations in FIX: Make migrations work with Discourse stable · discourse/discourse-policy@94635bf · GitHub. I hope there was nothing else in the last couple of commits that breaks on the stable branch.