[FIX] cli/server: fixes #1307, add missing Environment management blocks
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-win32