Importing older (before Jun-2017) layout breaks compilation (WhiteFox IC60)

[jbondeson]

Web import completely overwrites all header values including removing the new layout designator used for compiling WhiteFox and IC60.

Import should do a merge on the headers.