FLUID-5053: udpate the uio build dependences to work with custom concatenated builds.
Merge remote-tracking branch 'yzen/FLUID-5053'

* yzen/FLUID-5053:
  FLUID-5053: udpate the uio build dependences to work with custom concatenated builds.