Merge "credstore: Fix several problems with credstore."