Modified order of swift's endpoint creation params

Changed the parameters order for the swift endpoint creation.

Change-Id: I7574375e5165d2ee9477e0f5bdfe02dbe3b38c09
Fixes: bug #1175610
Merge "Modified order of swift's endpoint creation params"
Fixes for Ubuntu network setup

Change-Id: I1d7a7d9a2a4974773573f708ae3c1d243aae84dc