Merge "credstore: update credstore.rc to use correct class, user, and group."