added optional salt:bootstrap:extra dict in salt.master config, to make unittest possible