FLUID-5099: adding a test case and a fix for change request source name collision.
Merge remote-tracking branch 'yzen/FLUID-5099'

* yzen/FLUID-5099:
  FLUID-5099: adding a test case and a fix for change request source name collision.