[Bug 1201483] upstream fixes for multipath-tools 0.9.0