Bit more data overlay setup and import cleanup
One more flag set based on not-quite-complete information, which needs to be fixed to cope with data overlay. Helps with ATLASG-1532
Cleaning a couple of imports up in the meantime.
One more flag set based on not-quite-complete information, which needs to be fixed to cope with data overlay. Helps with ATLASG-1532
Cleaning a couple of imports up in the meantime.