#1062 Fixes a bug in the real time expiration time calculation

Still not perfect, but avoid over-cleaning

Some UT have been added for the cleaner itself.

Tests on the BDSI import for services that finishes after 0am are welcome.