Merge "Northbound cleanup for Flow programmer"