MBST-4754: Fixes to YouTube adapter
Merge branch 'MBST-4533-youTubeAdapter' into stage