Reorder/rename topology options, move connectivity to site planning

Change-Id: I13f7d91f9632868a9021923f15ab63a3813a4f4d
(cherry picked from commit 6c2205adc1632989fc449af6bedc7f7bcbcd2785)
2 files changed