Bug 867056. r=rstrong
bug 874977. Update to new "lock" icons for displaying site identity status. r=mbrubeck