Remove global PROMISETIME
Merge branch '3.5.x' of github.com:cfengine/core into 3.5.x