BucketNumber & Timestamp: fix bucketing and alignment arithmetics
Merge branch 'master' of https://github.com/hotels-tech/metrik
fix merge