Simplifying the Exchange autodiscover process

CHG0068181 Simplifying the Exchange autodiscover process