[FIX] survey: display_mode is required if question type is simple_choice

Fixes #2461
[FIX] survey: typo in domain
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-linux64