Engine: Refs #3585 - Fix user model test
Merge pull request #3407 from daviddavis/temp/20131119142527

Engine: Refs #3585 - Fix user model test
Merge branch 'engine' into engine-api-spec-tests