[MERGE] Forward-port saas-5 up to f9bcd67f

addons/auth_ldap/users_ldap.py

addons/payment/__openerp__.py

addons/payment/security/ir.model.access.csv

addons/payment/security/payment_security.xml

addons/payment_paypal/models/paypal.py

addons/point_of_sale/point_of_sale.py

addons/portal_sale/security/ir.model.access.csv

addons/website_sale/controllers/main.py

addons/website_sale/models/sale_order.py

addons/website_sale/views/sale_order.xml

openerp/models.py

openerp/modules/loading.py