Storefront: bug-fix of deprecated method  of category block controller
Merge branch '1.1.7' of github.com:abantecart/abantecart-src into 1.1.7
Control Panel: migration bug-fix related to osc2.2