Adding auto-discover master to instance and sentinel
Merge commit '3a15fac6a2f7f1e71fdadffae2a2f872ae6e1e3b'