Merge remote-tracking branch 'vicamo/bugzilla/777271/master' into HEAD

Conflicts:
	dom/base/nsDOMClassInfo.cpp
	dom/telephony/Makefile.in
Merge commit 'vicamo/bugzilla/834193/master' into HEAD

Conflicts:
	js/xpconnect/src/event_impl_gen.conf.in
Bug 834160 - Part 1/N: interface changes.
Bug 834160 - Part 2/N: fix dom implementations