[bug 996059] Add waffle flag to settings template.
Merge pull request #734 from akatsoulas/996059

[bug 996059] Add waffle flag to settings template.