Merge "Remove DALI_GLES_VERSION compile option in dali-core" into devel/master