more refactoring on data-import phase2
Merge branch 'master' of https://github.com/steveoro/goggles