Minor cleanups in appimport
Update app-import application contexts to work with spring-security 4 #4716
Rename NonViralName authorteams to authorship #4968
added xml importer of bfn data to trunk