[MERGE] Forward-port saas-3 up to 09ab2d4

diff --cc addons/point_of_sale/point_of_sale.py
Simple merge

diff --cc openerp/modules/loading.py
Simple merge

diff --cc openerp/osv/orm.py
index 853ec4c,520b2b0..986c14e
--- 1/openerp/osv/orm.py
--- 2/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@@ -53,9 -53,10 +53,10 @@@ import simplejso
  import time
  import traceback
  import types
+ from collections import defaultdict
  
  import babel.dates
 -import dateutil.parser
 +import dateutil.relativedelta
  import psycopg2
  from lxml import etree