Merge "(bug 33471) Changed detection of secure cookies."