Adding Group context for Blocks (and other Entities), with updated tests. For 2.x branch.

Proposed solution for #3170013 for 2.x branch. Only differences are machine names that differ between Group 2.x and 3.x branches.