Extend expiry date of some switches
Merge pull request #7484 from guardian/expiring-switches

Extend expiry date of some switches