Master issue 2659

fixes #2659
ceils nanosecond values to 1 ms to prevent no eviction case