Expedient: GENI section for certs & keys is mostly fixed (II)