Merge XDT transform from Nuget 2.5 danliu

Merge XDT transform from Nuget 2.5 danliu to Nuget 2.5