[FIX] website_sale: right number of products in the page

The goal is to fill the page with at least 20 products and to fill all grid lines
Thus, the page should be filled with products until there are 20 products and all lines of the grid are full.
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-linux64