Revert "Revert "trebuchet: derive the grain name from the repo name""

This reverts commit 8b602c08df041a369b0408a81f894d6b33cf07a2.

Change-Id: Iec445438f18e6e3c14e2d08dcb08a177f7dd6c80