merge fix and commit fix for condition check in getDNS
merge fix and commit fix for condition check in getDNS

couchbase-partners/amazon-cloud-formation-couchbase,couchbase-partners/amazon-cloud-formation-couchbase