Merge pull request #4046 from RosettaCommons/revert-4044-revert-4004-vmullig/threadsafe_options_system Re-merge "Make the options system threadsafe"