[#2200] Removing one more reference to auto_start and updating all of the configuration to the latest 2.1