Can't migrate or reset DB due to unknown attribute `elasticsearch_url`

I attempted to migrate my MySQL EE instance, but got this error:

/Users/stanhu/gdk-ee-mysql/gitlab/app/models/application_setting.rb:308:in `elasticsearch_url='
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/current_settings.rb:31:in `in_memory_application_settings'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/current_settings.rb:25:in `ensure_application_settings!'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/current_settings.rb:7:in `current_application_settings'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/metrics.rb:11:in `settings'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/metrics.rb:23:in `enabled?'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/metrics.rb:143:in `<module:Metrics>'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/metrics.rb:2:in `<module:Gitlab>'
/Users/stanhu/gdk-ee-mysql/gitlab/lib/gitlab/metrics.rb:1:in `<top (required)>'
/Users/stanhu/gdk-ee-mysql/gitlab/config/initializers/8_metrics.rb:141:in `<top (required)>'
/Users/stanhu/gdk-ee-mysql/gitlab/config/environment.rb:5:in `<top (required)>'
/Users/stanhu/.rbenv/versions/2.3.3/bin/bundle:22:in `load'
/Users/stanhu/.rbenv/versions/2.3.3/bin/bundle:22:in `<main>'

I think 5a901cdf added this, with the assumption the database already had the schema change.

/cc: @nick.thomas