Merge "Libraries & RPM renamed to provide DALi 2" into devel/master