Added fix for ELContext initialization (no more unknown scope errors)
Merge branch 'master' into BRANCH_PLATFORM_5