Visa, Mastercard reach revised swipe-fee settlement with merchants