allow for alerting on non-dns AWS instances..pick the best alerting text
merge upstream doc changes