Merge "Remove DALI_ADAPTOR_COMPILATION define" into devel/master