[css-grid] Align grid-template grammar dfn with the propdef table. Add ids to some complex grammar dfns.
[css-color] Linger reference to rgb() with optional alpha, which the WG rejected.