conf file for discovery got changed

Change-Id: Ieba5413d3eae0ce8a8efff16c929658db86b8ab2
Merge "conf file for discovery got changed" into R1.10