CLC-1482 Respect the maximum_expires_in setting
Merge pull request #925 from ctweney/clc-1482

CLC-1482 Respect the maximum_expires_in setting