China Orders Merger of Sinopec and National Aviation Fuel Giant