Issue #2340885 by katbailey, eshta: Syncing of agents and their components when saving option sets is broken