Adding configuration option to tell which store supports credential management.
Merge remote-tracking branch 'upstream/master'