Cowboys and All-Pro guard Zack Martin agree to reworked 2-year, $36M+ deal