Miscellaneous app cleanup (#7594)

* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks

cmd/platform/jobserver.go

@@ -8,9 +8,6 @@ import (
 	"syscall"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/mattermost-server/store/sqlstore"
-	"github.com/mattermost/mattermost-server/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -36,9 +33,7 @@ func jobserverCmdF(cmd *cobra.Command, args []string) {
 		panic(err.Error())
 	}
 	defer l4g.Close()
-
-	a.Jobs.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(utils.Cfg.SqlSettings, a.Metrics), a.Metrics, a.Cluster)
-	defer a.Jobs.Store.Close()
+	defer a.Shutdown()
 
 	a.Jobs.LoadLicense()