14325: fix timer name collision
Merge remote-tracking branch 'origin/1.0-wapstart' into 1.0-wapstart