Build fixes for mpath_persist and multipath