add generic master merge into release/* branches (#6249)
add generic master merge into release/* branches (#6249)


scalp42/consul,kingland/consul,42wim/consul,scalp42/consul,scalp42/consul,kingland/consul,hashicorp/consul,42wim/consul,scalp42/consul,hashicorp/consul,scalp42/consul,hashicorp/consul,kingland/consul,42wim/consul,kingland/consul,42wim/consul,42wim/consul,hashicorp/consul,kingland/consul