Change vagrant setup to use mozilla.local instead of local.mozilla.org
Bug 993485 - Remove WebFWD and Labs links from the Products page and Tabzilla
Map 30+ relnotes to bedrock to fix Bug 994186

Also map system requirements
Map all channels: Aurora, Beta, Release, ESR
Merge pull request #1869 from jgmize/apache-30+relnotes

Map 30+ relnotes to bedrock to fix Bug 994186
Fix bug 993750 - add a notice about Java detection errors
Bug 925278: activate channel page for Occitan (oc) locale
Merge pull request #1872 from pascalchevrel/bug-925278-channel-page-occitan

Bug 925278: activate channel page for Occitan (oc) locale
Merge pull request #1867 from craigcook/bug-993750-plugincheck-java-notice

Fix bug 993750 - add a notice about Java detection errors
Merge pull request #1865 from kyoshino/bug-993485-tabzilla-webfwd

Fix Bug 993485 - Remove WebFWD and Labs links from the Products page and Tabzilla
Merge pull request #1779 from dlapiduz/vagrant_setup

[Fix bug 908217] Change vagrant setup to use mozilla.local instead of local.mozilla.org
Add firefox desktop pages. Bug 975156.
Merge