Bug 985007 - allow clients to request shorter token duration; r=telliott