Bug 968199 - remove OPENGL_IS_BROKEN_HERE=1 from EC2 test machines. r=backout
Bug 979428: re-enable upstream syncs in relabs; a=orgonly
Merge default -> production

--HG--
branch : production