Enable the merge logic again

This patch enables the merging logic of dr_agent.py.

Change-Id: I29875b3bfa950e4310f8fc4a6a7a10b938c22c2b
Signed-off-by: Taku Fukushima <tfukushima@midokura.com>