Re adding key expiry
The version of check for travis ci doesn't support ck_assert_int_gt
Cleanup from Coverity scan
Merge branch 'master' into debian