Use relative expiry except when we want a record to expire immediately
Merge pull request #174 from Metaswitch/iss160

[Reviewer: Mike] Use relative expiry except when we want a record to expire immediately