Merge "Remove f branch from sdnca1controller config"