Improoved HSTS support

Bug 946697
Bug 946705
Updated links to https
Fixed mixed content issue