Merge "Remove ansible-role from implied role names" into feature/zuulv3