Merge "Allow setting more master and minion options"