ICCAT agrees to measures for Atlantic bluefin, mako sharks