Added the checks to turn off feedback experiment.
Merge branch 'finished' into feedback_collect
More test fixes...
Merge pull request #481 from code-dot-org/feedback_collect

More test fixes.
Merge pull request #482 from code-dot-org/finished

Finished to Delievered