Log: controld: Show action timer plus cluster-delay in action_timer cb
    
    `action_timer_callback()` prints a misleading error message. If it
    times out waiting for an action result, the error message prints the
    timeout value followed by "(action timeout plus cluster-delay)".
    However, only the `action->timeout` value is displayed. `cluster-delay`
    is not added in.
    
    Resolves: RHBZ#1856035
    
    patch_name: 009-timeout-log.patch
    present_in_specfile: true
    location_in_specfile: 9
    squash_commits: true