Provisional fix when using extends for credentials.

See https://github.com/saltstack/salt/issues/8605