test fix
Merge branch 'develop' of https://github.com/splunk/splunk-sdk-csharp-pcl into develop
Merge branch 'develop' of https://github.com/splunk/splunk-sdk-csharp-pcl into develop
Fix merge conflict: Add back Mockcontext library