_getCarrierList() > $link_conditions with SSL

SSL parameter added to add https to the terms of services link for fancy fancy box on OPC page.
Found this bug in this configuration : 
1.6 store + 1.6 PS bootstrap theme + SSL + account created + disconnected
1- add a product to the cart
2- Go to OPC 
3- Check that the link to terms of services (fancy box) has HTTPS
4- login on the OPC page (already has an account click here)
>> The terms of services does NOT have the HTTPS. So the cms page won't load there is this error message in the debug console : 

[blocked] The page at 'https://www.______________.com/fr/commande-rapide' was loaded over HTTPS, but ran insecure content from 'http://www.______________.com/fr/content/conditions-d-utilisation-3?content_only=1': this content should also be loaded over HTTPS.
Fix PSCSX-1581. Adds bootstrap class around all alert messages so they
are displayed properly.
// categories/list_header.tpl: Clearer strings.
Merge pull request #1677 from xBorderie/patch-1

// categories/list_header.tpl: Clearer strings.
[-] FO : Fix bug #PSCSX-1717, active
Merge pull request #1672 from cedricgeffroy/patch-1

[-] CORE : $link_conditions with SSL
// PasswordController: typo.
Merge pull request #1679 from xBorderie/patch-2

// PasswordController: typo.
[*] BO : string updated in AdminStockManagementController.
Merge pull request #1680 from xBorderie/patch-1

[*] BO : string updated in AdminStockManagementController.
// Add one word to voucher emails.
// payment/view.tpl: typo.
Merge pull request #1683 from xBorderie/patch-1

// payment/view.tpl: typo.
[+] LO : Added Norwegian (Bokmål) installer
Merge pull request #1684 from djfm/1.6

[+] LO : Added Norwegian (Bokmål) installer
// Typo: "Remote payment accepted"
// fowllow up https://github.com/PrestaShop/PrestaShop/pull/1685
// AdminShopController: better strings.
[-] BO : FixBug #PSCFV-11946
Merge pull request #1687 from xBorderie/patch-1

// AdminShopController: better strings.