Bug 965672 - use pluggable secrets-handling class; r=telliott