Fix the build by merging both db migrations heads

[mistercrunch]

No description provided.

[codecov-io]

Codecov Report

Merging #5464 into master will increase coverage by 10.77%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #5464       +/-   ##
===========================================
+ Coverage   48.34%   59.12%   +10.77%     
===========================================
  Files         328      372       +44     
  Lines       14762    23762     +9000     
  Branches     2758     2758               
===========================================
+ Hits         7137    14049     +6912     
- Misses       7610     9698     +2088     
  Partials       15       15

Impacted Files	Coverage Δ
superset/dict_import_export_util.py	28.57% <0%> (ø)
superset/data/countries.py	100% <0%> (ø)
superset/connectors/druid/models.py	82.42% <0%> (ø)
superset/connectors/connector_registry.py	89.74% <0%> (ø)
superset/sql_parse.py	99.13% <0%> (ø)
superset/forms.py	98.11% <0%> (ø)
superset/views/__init__.py	100% <0%> (ø)
superset/views/base.py	67.56% <0%> (ø)
superset/models/core.py	85.98% <0%> (ø)
superset/models/helpers.py	87.7% <0%> (ø)
... and 34 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7fcc2af...a51197a. Read the comment docs.

[mistercrunch]

Merging without approval to fix the build