STOR-87 upgrading across STOR-84 requires dump device reinitialization
Merge branch 'master' of git://github.com/joyent/smartos-overlay into ec