Merge "Plugin so files renamed to provide DALi 2" into devel/master