BAC-537: Custom expiry options for Phalanx blocks
Merge pull request #1091 from Wikia/bac-537-phalanx-custom-expiry

BAC-537: Custom expiry options for Phalanx blocks