only show vertical scroll bars if we needed (on page and for bootstrap modal)
Merge pull request #1321 from jay-hodgson/SWC-1921

SWC-1921: only show vertical scroll bars when needed (on page and for bootstrap modal)
Merge branch 'release-68' into develop
Merge pull request #1325 from jay-hodgson/develop

merge from release-68