Pushing the commits related to #1122 - still needs code clean from yesterday
Completed CBP support. Resolved show-hide with permissions for accessing the CBP dashboard page if CBP opts are not enabled.