resolve merge conflicts#231

GarrettBeatty merged 2 commits intodevaws/aws-dotnet-extensions-configuration:devfrom

gcbeatty/devconflictsaws/aws-dotnet-extensions-configuration:gcbeatty/devconflictsCopy head branch name to clipboard