FLUID-5197: Fixed the problem with the aux builder that the use case of multiple composite per aux schema is not handled properly. Also removed a deprecated message bundle function.
Merge remote-tracking branch 'cindy/FLUID-5197'

* cindy/FLUID-5197:
  FLUID-5197: Fixed the problem with the aux builder that the use case of multiple composite per aux schema is not handled properly. Also removed a deprecated message bundle function.