Merge branch 'CSP-work'
Version bump
Prevent errors about incomplete e10s webNavigation when opening a new browser window
Give user control over media sharing.
Bug 1062981 (CVE-2014-1586) Navigating away from a page with camera sharing in an iframe leaves camera recording.
Bug 1068218 - (CVE-2014-1581)
Fix JS crash in some rare OOM situations
Bug 1069584: Bail if a cairo surface is in an invalid state.
Initialize mSurface for DrawTargets
Bug 1074280 - Use AsContainerLayer() in order to avoid a bad cast
Bug 1079729: Fix handling of increasing number of SCTP channels used by DataChannels
Back out rare OOM js crash fix for build bustage.
Don't use undefined error function.
Remove media navigator check from nsdocument
Clean up browser confvars.sh
Disable crashreporter by default in configure.
Clarify configure text for Google's SafeBrowsing
Fix build bustage when not building with MOZ_MEDIA_NAVIGATOR
Android: improve session restore + add user option checkbox.
Replace invalid MOZ_CRASH calls with NS_NOTREACHED in new flexbox code (Linux build bustage with W=E)