Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev