Fixed HNCP handling of 'long' (=infinite, or close to it, 2^32+ ms) lifetimes to be correct. Also fixed unit tests to have handling for them.