Use regular expression comparisons on expiry times to make valgrind runs reliable
Merge pull request #553 from Metaswitch/vg_timing_failures

Reviewer Ellie: Use regular expression comparisons on expiry times to make valgrind runs reliable