Clear request contexts in a timely manner - EUCA-8069

EUCA-8069
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8069' into testing