Try to handle expiring tokens. refs #2514
added package order