Bug 1017763 - Add :ianconnolly's SSH key and LDAP name; r=dustin
Merge default -> production

--HG--
branch : production