Merge "Fix retrieval of mso.config.path" into dublin