Fixing ticket #21371

Added the test case for the ticket #21371 as well as updated the templates with the needed "block.super" .
All the these test cases are passing.

J