2.04.0:minrog:25 Ck2+ counties re-added

Add back c_sinkat in Ethiopia and c_teate in Sicily (preliminary).
Resolved file conflicts between c_aprutium and c_teate but both counties
and the 3 Duchies around them need to be modified with more historical
borders.  Eventually.