fix for OOIION-1277
Fixes the submodules to REL2.0's current submodules
Merge pull request #1344 from ooici/ooiion1277_r2

Ooiion1277 r2