Merge proposals dependent on lp://staging/~openerp-dev/openobject-server/trunk-closure-style-jpa

1. trunk-closure-style-jpa
2. Dependent merge proposals