Engine: Refs #3641 - Fixing v2 controller tests
Merge pull request #3378 from daviddavis/temp/20131114093349

Engine: Refs #3641 - Fixing v2 controller tests