Fix timekey generation

eg. Min10_10 should be Min10_15

Redmine #3215 (internal)

(cherry picked from commit 032b28bdd41ad84c8691b492f14bd498edb18b20)
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara