Reorder/rename topology options, move connectivity to site planning

Change-Id: I13f7d91f9632868a9021923f15ab63a3813a4f4d
2 files changed