Hours after spat with Amman forces him to cancel planned trip to the UAE, PM asserts matters with Jordan have been straightened out