CRJ700-Family: resolve *-set.xml file conflicts.
From: Hamza Alloush <hamzaalloush@...>
Authored by: hamzaalloush 2016-01-09
Parent: [r1461]
Child: [r1463]