Fixed current fxcop warnings in code owned by OneSDK team
Resolving merge conflict
Merge pull request #1323 from christav/fix-fxcop-warnings-1087

Fixed current fxcop warnings in code owned by OneSDK team