[PLINK-130] - Credential support for the file store. Fixing small issues.