Merge prop328 into dir-spec

We also need to change that the overload lines are in the service descriptor now, not extra-info.