Merge proposals dependent on lp://qastaging/~openerp-doc/openerp-doc-utils/doc-build-scripts-improvements-xmo

1. doc-build-scripts-improvements-xmo
2. Dependent merge proposals