Merge "[AAF] Give `identities.dat` to working deployments"