Merge "Bug 615: Removed xtend from Topology Manager"