Fixes #4158: integrating cfengine 3140, to prevent the promises fro being check at every run