Merge branch 'hotfix/2.6.1'
BRBPL-3223 Using endslate as one word for consistency. Grabbing config from flash player for endslate to use.
Merge branch 'hotfix/2.6.2' into develop