Blockchain startups Ripple and R3 have resolved a legal battle that saw both firms filing suits in the U.S. over a contract dispute.