Merge pull request #5023 from ianhattendorf/fix/lock_missing_global_config Correctly write to missing locked global config