Disable the false import error
Merge branch '2014.7' into develop

Conflicts:
	tests/unit/modules/boto_vpc_test.py