Clean up conventions for underscores vs. dashes in config setting.
Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup

Clean up conventions for underscores vs. dashes in config setting.