[MERGE] Forward-port saas-4 bugfixes up to ad4c6cae

addons/account/account.py

addons/account/account_move_line.py

addons/account/partner.py

addons/account_voucher/voucher_payment_receipt_view.xml

addons/base_action_rule/base_action_rule.py

addons/base_action_rule/base_action_rule_data.xml

addons/gamification/models/goal.py

addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml

addons/l10n_be_hr_payroll_account/data/hr.salary.rule.csv

addons/l10n_multilang/account.py

addons/survey/controllers/main.py

addons/survey/security/survey_security.xml

addons/survey/static/src/js/survey_result.js

addons/survey/views/survey_templates.xml

addons/website/models/ir_qweb.py

addons/website/models/website.py

addons/website_event_track/controllers/event.py

openerp/addons/base/ir/ir_qweb.py

openerp/addons/test_converter/tests/test_html.py

openerp/osv/fields.py