Automatic merge from submit-queue

Fixing local cluster up

hack: fix local-cluster-up advertise_address default value
Fixes: 9fc1d61aSigned-off-by: André Martins <aanm90@gmail.com>

ping @dims