Gazprom, OMV ditch asset swap deal, agree new terms