Border issue to Mansarovar yatra resumption: India, China agree on 6 points as Ajit Doval, Wang Yi meet in Beijing