Added 'roster_file' setting to the salt_master map.
Merge branch 'development' into production