John Kelly involved in November scuffle with Chinese officials