[migrator] Upstream overlay3/4.json and associated tests.

These being downstream only made them easy to break (and they did).

Resolves rdar://problem/41353459

Author: Nathan Hawes