Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-test-ui-partnership-analyis-bug

1. trunk-test-ui-partnership-analyis-bug
2. Dependent merge proposals