Feature/istwcms 4174 ebremner cleanup sidebar code

Eric Bremnerrequested to merge
feature/ISTWCMS-4174-ebremner-cleanup-sidebar-code into 8.x-1.x

Check that sidebars can still be added and code review all changes.

Merge request reports