Merge mono-2017-10 to master#204

akoeplinger wants to merge 2 commits intomasterdotnet/java-interop:masterfrom

mono-2017-10dotnet/java-interop:mono-2017-10Copy head branch name to clipboard