Bug 1041577: toplevel::server conditional for mig::agent inclusion
fixed conflict
Bug 1062875: bump mig-agent version