Bug 1041577: toplevel::server conditional for mig::agent inclusion; r=dustin
Bug 1041577: enable mig-agent (re-land); r=ulfr
merge default -> production

--HG--
branch : production