Merge "Fix creating _dist_<goal> targets under !dist"