Rename NonViralName authorteams to authorship #4968
fix NPE in Match Strategy generation (not sure if this is correct)
had to rename the packages to make them compliant with buckminster