Fix Bug 906125: Changed Waffle Flags.

This PR adjusts the flags. Please note:

* I'll have to do a bit more refactoring when I add the additions for voting end. But I would prefer to do that outside of this initial PR.

* We will need to create these flags on dev, stage, prod.