Allow setting more master and minion options

Change-Id: Ia4ba14bac02ddbceb986f725cf25664eca77bfe0
2 files changed