merge discovery changes (rack & datacenter) by axle-h