* changes to use either maemo-provider-data.keyfile or modest-provider-data.keyfile