Merge pull request #1120 from pulp/barnabycourt-1108306

1108306 - Update Nectar version for cancel hang
Merge remote-tracking branch 'remotes/origin/2.4.1-dev' into 2.4-dev