(dev/core#2258) SMTP Password - If CRED_KEYS is defined during upgrade, use it