CRM-13863 - Update more dependent tabs and blocks
Merge pull request #2663 from colemanw/tabs

CRM-13863 - Update dependent tabs and blocks