CLC-1209 Rudimentary feature toggle support
CLC-1209 Tweak initial feature settings structure
Merge pull request #644 from ctweney/feature-toggling

CLC-1209 Feature toggling