Merge proposals dependent on lp:~openerp-dev/openobject-server/7.0-fix-1179844-no-http-worker-thu

1. 7.0-fix-1179844-no-http-worker-thu
2. Dependent merge proposals