Fix keychain access; respond to new Jenkins variables