Fixes to get e40s bench up and running to master branch

Created by: strichmo

This is a cherry-pick of https://github.com/openhwgroup/core-v-verif/pull/883

retargeted to the master branch with some cleanup for core cntrl extension switches for the Zb* extensions.

This passes all e40s ci_check but I am pushing up anyway to get these fixes working and I am not sure of the expected state of the E40S ci_check.