Fixup syndic returns

Fixes up a couple of changes relating to reliably getting syndic returns back to the master of masters.

The second commit in particular fixes a regression between 2014.1.4 and 2014.1.7.

See the commit comments for more details.