Bug 839767 - Update another hard-coded layout height to use an attribute. r=sriram
Bug 834836 - CSP - Fix tests that break when security.mixed_content.block_active_content is set to true and if/when security.mixed_content.block_display_content is set to true. r=sstamm
Bug 834836 - Allow mixed active content on mixed content tests that depend on mixed active content to test securty state changes. r=bsmith
Bug 834836 - /dom/tests - Fix tests that break when security.mixed_content.block_active_content is set to true and if/when security.mixed_content.block_display_content is set to true. r=smaug,msucan