Merge "Updates after DALi library name changes" into devel/master