[Bug 1201483] New: upstream fixes for multipath-tools 0.9.0