Adjustments of dts and defconfig files to adjust for the MERGE removal. The revert of MERGE requires specific dts and defconfig files for boards which relied on the MERGE feature. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
