Jaishankar, Chinese FM discuss border situation