added tabs to scaffolding imports
Merge branch '7.x-1.x-dev' into 7.x-1.x