TS-2868: Error setting HSTS max age with traffic_line
Merge branch 'master' into 5.0.x