Made Swift topology optional for data locality

Change-Id: I80d33543cc2173dd62beab17f811f0f8e162a078
Closes-Bug: #1257945
Merge "Made Swift topology optional for data locality"