modify syndic opts management to cleanly merge minion and master opts
modify syndic opts management to cleanly merge minion and master opts

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt