Charging ahead with the dramatic remaking of his White House, President Donald Trump said he would replace national security adviser H.R. McMaster with the former U.N. Ambassador John Bolton, a foreign policy hawk entering a White House facing key decisions on Iran and North Korea.