Bug 1035984: fix typo that caused ssh::extra_authorized_keys to fail; a=bustage
Merge default -> production