Got them! Just in case you run out of stock, you can pick up some more from TE or a reseller with these part numbers:
Key ID 1
Plug for loom: 3-1437290-7 (AMP 3900113-2621) http://www.te.com/catalog/pn/en/3-1437290-7?RQPN=3900113-2621
Inline header: 6437288-6Â http://www.te.com/catalog/pn/en/6437288-6?RQPN=6437288-6
TE doesn't appear to stock a correctly keyed right angle PCB header, but I don't need that anyway.
The plug also needs the pins, and an appropriate tool, of course.
Fred.