Merge inbound to m-c.
Merge m-c to inbound.
Bug 599804 - Highlight all doesn't work with non HTML documents (e.g. CSS styled XML files). r=adw
Bug 872709 - Reorder WebrtcVideoConduit init list to fix build warnings. r=gcp