Merge "Fix to allow Switch configuration modification(Description and Tier) in non...