Fix incorrect import statements in SqlServerConnection class
Merge branch '4.0'