Merge "Ignore stopped/deleted users when filling cache." into nyc-mr1-dev