Fix #3846

When the syndic merges minion and master opts interface needs to
persist