Bug 974406 - Bookmarking UI doesn't work correctly to HSTS pages. r=gavin
Automatic merge