Remove unused import
Remove PyLint disable rule in 2014.7

Since it's unlikely we upgrade PyLint in this branch
Merge branch '2014.7' into develop

Conflicts:
	tests/unit/modules/boto_vpc_test.py