Merge "Migrate mininet to CP ubuntu-16.04.json"