Shakeup reinstating chairman of Joint Chiefs of Staff to council, a day before Trump summit with Xi Jinping, is seen as a victory for national security adviser H.R. McMaster