Fix template with sql server fails due to secure string value not being sent over the wire
Merge pull request #2588 from ogail/restructure

Fix template with sql server fails due to secure string value not being ...