Merge "Update configuration options ssh-auth-strategy"