Merge pull request #10446 from dmcgowan/defer-key-file-creation

Defer creation of trust key file until needed