Issues #842 and #846

#842: added sorting for ordered products' options
#846: moved MarketInSG commit to 1.5.6.1: Move blacklisted ip to ban ip table during upgrade