CA-132062: Import multipath.conf changes from sm.git/master+sm/master/pull/146 into sm.git/xs64bit