Restore old warnings.formatwarning after workaround

See https://github.com/saltstack/salt/pull/17298#issuecomment-62364647
Merge pull request #17311 from terminalmage/warn_until

Restore old warnings.formatwarning after workaround