[#LIB-79] Remove file storage support from BasicCStoreSCP
[#LIB-79] Remove file storage support from BasicCStoreSCP
Merge remote-tracking branch 'upstream/master'

Extracting latest changes so that I am working from the latest version.
Committing prior to merge with upstream changes.

Committing changes prior to working to merge upstream changes.