Merge "Bug 3661: Avoid storing mappings in config datastore when authentication fails...