[ADD] base_import: add the possibility to import one2many with database id, for users with technical features
[IMP] email_template: allow extra builtins in rendering sandbox
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9142 revid:dle@openerp.com-20140310101705-2g3e6gp5jd2g8fpc