dot-str: edge label, when available, takes precedence over weight.
Merge branch 'dot-str-label-over-weight' into fmjrey