Be less specific about the GSI .so version numbers.  #4483
Merge branch 'V8_3_1-branch'