Merge pull request #5829 from apache/sync-secret

use secret from config if ETS not populated