modified the Donet.ini and Donet.ned to be more or less compliant with ones in the inet branch
merged the churn.ini