Specify full class name for migrations to fix failing migrations
Merge remote-tracking branch 'upstream/master' into refresh-admin

* upstream/master:
  Specify full class name for migrations to fix failing migrations