Merge "Add sys config to handle apexes that are allowed to be updated" into sc-dev