Merge fixes.

migrations/migrationstestlib.go

@@ -322,6 +322,8 @@ func (s *mockPluginSupervisor) Hooks() plugin.Hooks {
 	return s.hooks
 }
 
+func (s *mockPluginSupervisor) Wait() error { return nil }
+
 func (me *TestHelper) InstallPlugin(manifest *model.Manifest, hooks plugin.Hooks) {
 	if me.tempWorkspace == "" {
 		dir, err := ioutil.TempDir("", "apptest")
@@ -417,3 +419,6 @@ func (me *FakeClusterInterface) sendClearRoleCacheMessage() {
 		Event: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLES,
 	})
 }
+func (me *FakeClusterInterface) GetPluginStatuses() (model.PluginStatuses, *model.AppError) {
+	return nil, nil
+}