Merge "Replace aai server cert with new SAN cert"