Revert "temprevert Heat network discovery change"

This reverts commit 8321902918852bbf9e33db1e3860e928a4c6087c, it doesn't
apply anymore without conflicts and is no longer needed.

Change-Id: I89a05378e720df7fa3383c6f5a219a36561ee063