Merge "Update ssh keys cleanup"