added ability in basket construct for delivery to add categories (cherry picked from commit d0525af) (cherry picked from commit c0f7608)
0004963: Login doesn't work with Mysql 5.5 and iUtfMode=1 unified default collation with salt field