Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go

Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go

Conflicts:
	public/app/features/dashboard/dynamic_dashboard_srv.ts

fix(templating): another fix for repeating panels and having old panels/scoped vars stuck after switching repeat variable, fixes #5795

Update the number of ways

closes #5786