Merge "Northbound cleanup for Switch Manager"