Bug 935753 - Firefox displays the "This is a secure Firefox page" indicator on pages served by addons. r=MattN

--HG--
extra : rebase_source : 20c3720bfc749401956ffa4553b9df2153231c3d
Bug 873626 - [Australis] Fix issue with specificity of nav-bar padding on Linux; r=dao

--HG--
extra : rebase_source : 0358784ed48ed4c8dc232530f8981ed1e44d02c0