Issue #2952999 by Jon Pugh, helmo: Merge remote-tracking branch 'origin/2952999-allow-alter-contexts' into 7.x-3.x