Bug 926468: remove keys from keys.pp (correct patch); r=Callek

This assumes they're in LDAP or $extra_user_ssh_keys by this point.
Merge default -> production