Specify 'user' for removed ssh keys

Change-Id: Ib25980a1c87a0da814bbd1af43dfbcb644511ace
Merge "Specify 'user' for removed ssh keys" into production