Oman Air has switched off an inflight map system that labelled the waterway between the Arabian Peninsula and Iran, the subject of a bitter naming dispute, as the "Persian Gulf".