Fix-ups for 3d3c9144 and 8dc45e87af

Use config key, not grain name, for trebuchet packages.

Change-Id: Ib010061df89e323d9d7fa7f2c02809f3dee83338