Continue if master in multi-master is down
Guh. Typoed earlier and forgot to remove.
Merge pull request #15333 from basepi/bp-14904

Backport #14904 and #14929 to 2014.1