CORE-4705: Ensure scroll bar on HLS editor popup
Merge branch 'master' into STABLE