The London mayor had a long-running row with Donald Trump during his first term in the White House