Additional fix for ERRAI-634: Ensure that long polling handler doesn't schedule a new polling request when there is already one pending
Merge branch '2.4'