Finish tweaking migration to merge duplicate hosts in the same workspace.
[Finishes #51335651]
[FIXRM #7988]
Minor version bump for updated migration.
Merge in latest master to resolve conflicts.
Merge pull request #32 from rapid7/bug/migration-blows-up-on-dupe-hosts-in-workspace

Specs and functional tests passing.