migrations: Avoid NPE on skipped join tables.
Merge branch 'master' into stable

* master:
  migrations: Avoid NPE on skipped join tables.