Fix #12810
Merge pull request #15550 from thatch45/2014.7

Fix #12810
Add docs for roster_file option
Merge pull request #15552 from thatch45/roster_master_config

Add docs for roster_file option
Merge branch '2014.7' into develop